Merge branch 'master' into stable

604 files changed, 65359 insertions, 65491 deletions

diff --git a/Android.mk b/Android.mk
index 6003f2603..2f9dad11c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,6 @@ SDL_PATH := ../SDL
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include \
     $(LOCAL_PATH)/src \
-    $(LOCAL_PATH)/src/guichan/include \
     $(ROOT_PATH)/xml2/include \
     $(ROOT_PATH)/gettext-0.18/gettext-runtime/intl \
     $(ROOT_PATH)/sdl_gfx \
@@ -17,7 +16,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include \
     $(ROOT_PATH)/curl/include \
     $(ROOT_PATH)/SDL2_net-2.0.0
 
-LOCAL_CPPFLAGS += -DUSE_SDL2 -DUSE_INTERNALGUICHAN -DEATHENA_SUPPORT -DUSE_OPENGL -DENABLE_NLS
+LOCAL_CPPFLAGS += -DUSE_SDL2 -DEATHENA_SUPPORT -DUSE_OPENGL -DENABLE_NLS
 LOCAL_CPPFLAGS += -frtti -fexceptions -Wno-error=format-security -fvisibility=hidden
 LOCAL_CPPFLAGS += -ffast-math -funswitch-loops -pedantic -Wall -Wc++11-compat -std=c++0x -funsafe-loop-optimizations -flto -fwhole-program
 
@@ -31,13 +30,15 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     $(subst $(LOCAL_PATH)/,, \
     $(wildcard $(LOCAL_PATH)/src/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/being/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/events/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/gui/models/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/popups/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/widgets/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/widgets/tabs/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/windows/*.cpp) \
-    $(wildcard $(LOCAL_PATH)/src/guichan/*.cpp) \
-    $(wildcard $(LOCAL_PATH)/src/guichan/widgets/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/gui/basic/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/gui/basic/widgets/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/input/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/net/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/net/ea/*.cpp) \
@@ -46,6 +47,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     $(wildcard $(LOCAL_PATH)/src/net/eathena/gui/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/net/tmwa/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/net/tmwa/gui/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/listeners/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/particle/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/render/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/*.cpp) \
diff --git a/ChangeLog b/ChangeLog
index aebe8fd88..fa7871682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-01 New release 1.4.3.1
+fix: crazy moves.
+add: missing help translations.
+add: allow load branding info from portable.xml.
+add: dehardcode weapons id for auto switching weapons.
+add: remove all depericated manaserv code.
+add: remove support for external guichan.
+
 2014-02-15 New release 1.4.2.15
 fix: friends tab update in social window.
 fix: windows resizing for smaller screen size.
diff --git a/README b/README
index ced5a922a..29bb1168b 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.4.2.15        Date: 2014-02-15
+ Version: 1.4.3.1        Date: 2014-03-01
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index dda556840..ced317da4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.4.2.15        Date: 2014-02-15

+ Version: 1.4.3.1        Date: 2014-03-01

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index 53ffa7624..c3f73541c 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.4.2.15" \
+    -DPRODUCT_VERSION="1.4.3.1" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 897a97c8f..273b043a2 100755
--- a/build/packtmw
+++ b/build/packtmw
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.4.2.15" \
+    -DPRODUCT_VERSION="1.4.3.1" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     tmw.nsi
diff --git a/build/packwin b/build/packwin
index 99754f169..54409f4b0 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.4.2.15" \
+    -DPRODUCT_VERSION="1.4.3.1" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 839f59080..f1aa8bb52 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.4.2.15], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.4.3.1], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
@@ -249,28 +249,6 @@ else
 fi
 AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes)
 
-# Option to enable internal guichan
-AC_ARG_WITH(internalguichan,[  --without-internalguichan        DEPRICATED. don't use internal guichan ] )
-if test "x$with_internalguichan" == "xno"; then
-    with_internalguichan=no
-
-    AC_CHECK_LIB([guichan], [gcnGuichanVersion], ,
-    AC_MSG_ERROR([ *** Unable to find Guichan library (http://guichan.sf.net/)]))
-    AC_CHECK_HEADERS([guichan.hpp], ,
-    AC_MSG_ERROR([ *** Guichan library found but cannot find headers (http://guichan.sf.net/)]))
-
-    AC_CHECK_HEADERS([guichan/widgetlistener.hpp], ,
-    AC_MSG_ERROR([ *** Guichan library version is found  but version is < 0.8.0 (http://guichan.sf.net/)]))
-
-    AC_CHECK_LIB([guichan_sdl], [gcnSDL], ,
-    AC_MSG_ERROR([ *** Unable to find Guichan SDL library (http://guichan.sf.net/)]))
-
-else
-    with_internalguichan=yes
-    AC_DEFINE(USE_INTERNALGUICHAN, 1, [Defines if ManaPlus should use internal guichan classes])
-fi
-AM_CONDITIONAL(USE_INTERNALGUICHAN, test x$with_internalguichan = xyes)
-
 # Option to enable mumble support
 AC_ARG_WITH(mumble,[  --without-mumble        don't use mumble integration ] )
 if test "x$with_mumble" == "xno"; then
@@ -298,17 +276,6 @@ else
     without_librt=no
 fi
 
-# Enable manaserv
-AC_ARG_ENABLE(manaserv,
-[  --enable-manaserv    Turn on manaserv support],
-[case "${enableval}" in
-  yes) with_manaserv=true ;;
-  no)  with_manaserv=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-manaserv) ;;
-esac],[with_manaserv=false])
-
-AM_CONDITIONAL(ENABLE_MANASERV, test x$with_manaserv = xtrue)
-
 # Enable eAthena
 AC_ARG_ENABLE(eathena,
 [  --enable-eathena    Turn on eAthena support],
diff --git a/data/help/about-tmw.txt b/data/help/about-tmw.txt
index 3ada32d85..20cf899d6 100644
--- a/data/help/about-tmw.txt
+++ b/data/help/about-tmw.txt
@@ -1,9 +1,9 @@
- <- @@index|Back to Index@@
+ <- @@index|<<Back to Index>>@@
 
 
-##3                      === ABOUT THE MANA WORLD ===
+##3                      === <<ABOUT THE MANA WORLD>> ===
 
- ##2The Mana World##0 is a serious effort to create an innovative free
+ ##2<<The Mana World##0 is a serious effort to create an innovative free
  and open source MMORPG world. The Mana World uses 2D graphics and aims to be
  as much diverse and interactive as possible. All content is licensed
- under the GPL, making sure this game can't ever run away from you.
+ under the GPL, making sure this game can't ever run away from you.>>
diff --git a/data/help/chatcommands.txt b/data/help/chatcommands.txt
index 70968830b..2b94512b9 100644
--- a/data/help/chatcommands.txt
+++ b/data/help/chatcommands.txt
@@ -19,23 +19,34 @@
     <</outfit N - wear outfit number N.>>
     <</outfit next - wear next outfit.>>
     <</outfit prev - wear previous outfit.>>
+    <</talkpet TEXT - talk from your pet.>>
     <</emote N - use emotion number N.>>
+    <</emotepet N - use emotion number N from your pet.>>
     <</away, /away MSG - set away mode.>>
     <</pseudoaway, /pseudoaway MSG - set/unset pseudo away mode.>>
     <</follow NICK - start follow mode.>>
     <</imitation NICK - start imitation mode.>>
     <</heal NICK - heal nick.>>
     <</move X Y - move to X,Y position in short distance.>>
+    <</movetotarget - move to target position.>>
+    <</movetohome - move to home position.>>
+    <</sethome - set home position.>>
     <</navigate x y - move to position x,y in current map in any distance.>>
     <</mail NICK MSG - send offline message to NICK. Working only in tmw server.>>
     <</disconnect - quick disconnect from server.>>
     <</attack - attack target.>>
+    <</atkhuman - select and attack nearest player.>>
+    <</magicattack - attack target with magic.>>
     <</undress NICK - remove all clothes from nick. Local effect only.>>
     <</addattack NAME - add monster to attack list.>>
     <</addpriorityattack NAME - add monster to priority attack list.>>
     <</removeattack NAME - remove monster from attack list.>>
     <</addignoreattack NAME - add monster to ignore attack list.>>
     <</setdrop N - set drop counter to requested value.>>
+    <</drop - drop N items from 0 slot.>>
+    <</dropn - drop N items from any slot.>>
+    <</info - show guild info. Only for native guilds only.>>
+    <</wait NAME - wait for nick or moster with name.>>
 
 ##9<<Trade>>
 ##2
@@ -53,7 +64,7 @@
     <</neutral NICK - add nick to neutral relation list.>>
     <</blacklist NICK - add nick to blacklist relation list.>>
     <</erase NICK - add nick to erased list.>>
-    <</clear - clear current chat tab.>>
+    <</enemy NICK - add nick to enemyes list.>>
     <</createparty NAME - create party with selected name.>>
     <</me text - send text to chat as /me command in irc.>>
     <</serverignoreall - ignore all whispers on server side.>>
@@ -62,12 +73,45 @@
 ##9<<Debug>>
 ##2
     <</who - print online players number to chat.>>
+    <</present - print visible players number to chat.>>
     <</all - show visible beings list in debug tab.>>
     <</where - print current player position to chat.>>
     <</cacheinfo - show text cache info.>>
     <</uptime - show client uptime.>>
+    <</dumpe - dump environment variables into chat.>>
     <</dumpg - dump graphics and some other settings to chat.>>
+    <</dumpgl - dump OpenGL version into chat.>>
+    <</dumpt - dump tests info into chat.>>
+    <</dumpogl - dump all OpenGL variables into log file.>>
+    <</dumpmods - dump all enabled mod names into chat.>>
     <</dirs - show client dirs in debug chat tab.>>
+    <</uploadconfig - upload main config into pastebin service.>>
+    <</uploadserverconfig - upload server config into pastebin service.>>
+    <</uploadlog - upload log into pastebin service.>>
+
+##9<<GM>>
+##2
+    <</announce MESSAGE - show global message.>>
+    <</createitems - open dialog for creating items.>>
+
+##9<<Tabs>>
+##2
+    <</clear - clear current chat tab.>>
+    <</enablehighlight - enable highlight in current tab.>>
+    <</disablehighlight - disable highlight in current tab.>>
+    <</enableaway - enable away messages in current tab.>>
+    <</disableaway - disable away messages in current tab.>>
+
+##9<<Content devs>>
+##2
+    <</cleangraphics - remove all cached graphics. Usefull for content developers.>>
+    <</testparticle FILENAME - set test particle on player.>>
+
+##9<<Other>>
+##2
+    <</cleanfonts - remove all cached render strings.>>
+    <</url URL - insert url into chat.>>
+    <</open URL - open url in browser.>>
 
 
 ##9<<Whispers commands>>
diff --git a/data/help/download.txt b/data/help/download.txt
index c0bcf9585..5438e3803 100644
--- a/data/help/download.txt
+++ b/data/help/download.txt
@@ -6,5 +6,5 @@
  ##2Android:     @@http://download.evolonline.org/manaplus/download/manaplus.apk|apk@@, @@http://www.amazon.com/gp/product/B00FINPCWA|Amazon@@, @@https://play.google.com/store/apps/details?id=org.evolonline.beta.manaplus|Google Play@@
  ##2MacOSX:      @@http://download.evolonline.org/manaplus/macosx/manaplus-lion-1.3.9.15.dmg|Lion@@, @@http://download.evolonline.org/manaplus/macosx/manaplus-snowleopard.dmg|Snow leopard@@
  ##2Windows:     @@http://download.evolonline.org/manaplus/download/manaplus-win32.exe|<<Download>>@@, @@http://manaplus.org/windowsinstaller|<<Instructions>>@@
- ##2Sources:     @@http://download.evolonline.org/manaplus/download/manaplus.tar.xz|<<Download>>@@
- ##2Other linux: @@http://download.evolonline.org/manaplus/download/manaplus-linux.tar.bz2|<<Download>>@@
+ ##2<<Sources:>>     @@http://download.evolonline.org/manaplus/download/manaplus.tar.xz|<<Download>>@@
+ ##2<<Other linux:>> @@http://download.evolonline.org/manaplus/download/manaplus-linux.tar.bz2|<<Download>>@@
diff --git a/data/help/support.txt b/data/help/support.txt
index a2ee332b5..21c76dc08 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,24 +7,24 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:>>
 
-<< For Evol Online support:
+ <<For Evol Online support:>>
 
  <<Visit IRC channel:>>
 ##2     #evolonline ##9@##2 irc.freenode.net
 
-<< For ManaPlus Online support:
+ <<For ManaPlus Online support:>>
 
  <<Visit IRC channel:>>
 ##2     #manaplus #evolonline ##9@##2 irc.freenode.net
 
 
-<< For TMW support:
+ <<For TMW support:>>
 
-<<##2     @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@
- or come visit us on our IRC channel:
+##2     @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@
+ <<or come visit us on our IRC channel:>>
 ##2     #themanaworld ##9@##2 irc.freenode.net
 
-<< Otherwise see the @@team|Development Team@@ section to have a list of
+ <<Otherwise see the @@team|Development Team@@ section to have a list of
  developers and how to contact them.>>
 
  <<For other server look servers pages for support.>>
diff --git a/data/help/team.txt b/data/help/team.txt
index 0b976c7fe..e51da3e89 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -25,6 +25,7 @@
 ##3== <<Translators>> ==
 ##3Czech
 ##9Petr Varkoček (pitriss) <chytrex_fsude centrum cz>
+##9Samuraiii <samurai no dojo+manaplus gmail.com>
 ##9Zirry <zirry centrum cz>
 
 ##3Danish
diff --git a/data/perserver/default/CMakeLists.txt b/data/perserver/default/CMakeLists.txt
index ed7e61e1e..19cf3686d 100644
--- a/data/perserver/default/CMakeLists.txt
+++ b/data/perserver/default/CMakeLists.txt
@@ -4,6 +4,7 @@ SET (FILES
     deadmessages.xml
     features.xml
     gmcommands.txt
+    weapons.xml
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/perserver/default)
diff --git a/data/perserver/default/Makefile.am b/data/perserver/default/Makefile.am
index 8a66984b8..5b478d82d 100644
--- a/data/perserver/default/Makefile.am
+++ b/data/perserver/default/Makefile.am
@@ -5,7 +5,8 @@ default_DATA =				\
 	chatcommands.txt		\
 	deadmessages.xml		\
 	features.xml		\
-	gmcommands.txt
+	gmcommands.txt		\
+	weapons.xml
 
 EXTRA_DIST =				\
 	$(default_DATA) \
diff --git a/data/perserver/default/weapons.xml b/data/perserver/default/weapons.xml
new file mode 100644
index 000000000..051e1f59e
--- /dev/null
+++ b/data/perserver/default/weapons.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<weapons>
+    <swords>
+        <item id="571"/>
+        <item id="570"/>
+        <item id="579"/>
+        <item id="867"/>
+        <item id="536"/>
+        <item id="758"/>
+    </swords>
+    <bows>
+        <item id="545"/>
+        <item id="530"/>
+    </bows>
+    <shields>
+        <item id="601"/>
+        <item id="602"/>
+    </shields>
+</weapons>
diff --git a/data/translations/help/CMakeLists.txt b/data/translations/help/CMakeLists.txt
index 9579b6d41..4cf2b1318 100644
--- a/data/translations/help/CMakeLists.txt
+++ b/data/translations/help/CMakeLists.txt
@@ -1,4 +1,5 @@
 SET(FILES
+    cs.po
     de.po
     es.po
     fr.po
@@ -7,6 +8,7 @@ SET(FILES
     pl.po
     pt_BR.po
     ru.po
+    zh_CN.po
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/translations/help)
diff --git a/data/translations/help/Makefile.am b/data/translations/help/Makefile.am
index d1754d13e..fd0a23ee7 100644
--- a/data/translations/help/Makefile.am
+++ b/data/translations/help/Makefile.am
@@ -1,6 +1,7 @@
 helpdir = $(pkgdatadir)/data/translations/help
 
 help_DATA =				\
+	cs.po				\
 	de.po				\
 	es.po				\
 	fr.po				\
@@ -8,7 +9,8 @@ help_DATA =				\
 	nl_BE.po			\
 	pl.po				\
 	pt_BR.po			\
-	ru.po				
+	ru.po				\
+	zh_CN.po			
 
 EXTRA_DIST =				\
 	$(help_DATA)			\
diff --git a/data/translations/help/cs.po b/data/translations/help/cs.po
new file mode 100644
index 000000000..4ba371436
--- /dev/null
+++ b/data/translations/help/cs.po
@@ -0,0 +1,1122 @@
+# en#
+# Translators:
+# samuraiii <samurai.no.dojo@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ManaPlus\n"
+"PO-Revision-Date: 2014-02-28 18:34+0000\n"
+"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "/invite NICK - invite a player to your party."
+msgstr "/invite PŘEZDÍVKA - pozve hráče do vaší party."
+
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr "/uploadserverconfig - nahrát konfiguraci serveru na pastebin."
+
+msgid "\"Switch pvp attack\""
+msgstr "\"Změnit útok hráče proti hráči\""
+
+msgid "To read about whispering and other chat commands, look here:"
+msgstr "Pro informace o šeptání a ostatních příkazech chatu se podívejte sem:"
+
+msgid "/away, /away MSG - set away mode."
+msgstr "/away, /away ZPRÁVA - nastavit režim away."
+
+msgid ""
+"You can select other themes.\n"
+"For this you should open settings and select theme tab\n"
+"and change \"gui theme\""
+msgstr "Můžete si vybrat jiná témata.\nPro výběr otevřete nastavení a vyberte záložku témat\na změnte \"téma ovládání\"."
+
+msgid "\"Target & attack\""
+msgstr "\"Zaměřit a zútočit\""
+
+msgid "/atkhuman - select and attack nearest player."
+msgstr "/atkhuman - zaměř a zaútoč na nejbližšího hráče."
+
+msgid "\"Emote shortcut 11\""
+msgstr "\"Zkratka smajlíka 11\""
+
+msgid ""
+" To add an item to the shortcut bar click on the item in the inventory window,\n"
+" then click on the box in the shortcut-window which should be associated with\n"
+" the item. To reorder items within the shortcut-window simply click and drag\n"
+" them between the boxes. To remove items you simply drag them outside of the\n"
+" window and drop them."
+msgstr "Pro přidání předmětu do lišty zkratek klepněte na předmět v inventářovém okně\na poté klikněte na slot ve zkratkové liště který jste si vybrali. \nPro přerovnání předmětů v liště zkratek je jednoduše přetáhněte na dané místo.\nPro odstranění přetáhněte předmět mimo lištu zkratek."
+
+msgid "\"Outfit shortcut 12\""
+msgstr "\"Zkratka výbavy 12\""
+
+msgid "/cacheinfo - show text cache info."
+msgstr "/cacheinfo - zobrazí informace o vyrovnávací paměti textu."
+
+msgid "/exp 0 - disable party experience sharing options."
+msgstr "/exp 0 - zakáže sdílení zkušeností v partě."
+
+msgid "\"Outfits window\""
+msgstr "\"Okno výbav\""
+
+msgid "KEYBOARD:"
+msgstr "KLÁVESNICE:"
+
+msgid ""
+" - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
+"   players?"
+msgstr " - ##2povolit obchodování##9: Chcete povolit obchodní požadavky od určitých hráčů?"
+
+msgid "\"Emote shortcut 9\""
+msgstr "\"Zkratka smajlíka  9\""
+
+msgid "/item 1 - enable party item sharing options."
+msgstr "/item 1 - povolit sdílení předmětů v partě."
+
+msgid "\"Set direction down\""
+msgstr "\"Nastavit směr dolů\""
+
+msgid "GM"
+msgstr "GM"
+
+msgid "\"Target NPC\""
+msgstr "\"Zaměřit NPC\""
+
+msgid "Party chat commands"
+msgstr "Chatové příkazy pro partu"
+
+msgid "/help - show this help."
+msgstr "/help - zobrazí tuto pomoc"
+
+msgid ""
+"You can walk to warps automatically.\n"
+"Open Social Window (###keyWindowSocial;) and selecy Nav tab,\n"
+"then click on warp what you want."
+msgstr "Můžete chodit k portálům automaticky.\nOtevřete Společenské Okno (###keyWindowSocial;) a vybete záložku Nav,\npoté klikněte na portál který chcete."
+
+msgid "/info - show guild info. Only for native guilds only."
+msgstr "/info - zobrazí info o gildě. Pouze pro nativní gildy."
+
+msgid "/neutral NICK - add nick to neutral relation list."
+msgstr "/neutral PŘEZDÍVKA - přidat přezdívku do seznamu neutrálních vztahů."
+
+msgid "\"Outfit shortcut 7\""
+msgstr "\"Zkratka výbavy  7\""
+
+msgid "/addpriorityattack NAME - add monster to priority attack list."
+msgstr "/addpriorityattack JMÉNO - přidat monstrum do priritního seznamu útoku."
+
+msgid "Back to Index"
+msgstr "Zpět na obsah"
+
+msgid "\"Quit\""
+msgstr "\"Ukončit\""
+
+msgid "THE PLAYER LIST"
+msgstr "SEZNAM HRÁČŮ"
+
+msgid "/priceload - load shop price from disc."
+msgstr "/priceload - načíst cenu obchodu z disku."
+
+msgid "Search string not found."
+msgstr "Hledaný výraz nenalezen."
+
+msgid "\"Quests window\""
+msgstr "\"Okno úkolů\""
+
+msgid "Other contributors"
+msgstr "Ostatní přispěvatelé"
+
+msgid ""
+"You can disable yellow bar,\n"
+"by pressing ###keyDisableGameModifiers;."
+msgstr "Můžete skrýt žlutou lištu, zmáčknitím ###keyDisableGameModifiers;."
+
+msgid "\"Next chat tab\""
+msgstr "\"Další záložka chatu\""
+
+msgid "Support"
+msgstr "Podpora"
+
+msgid "\"Quick drop window\""
+msgstr "\"Okno rychlého upuštění\""
+
+msgid "\"Screenshot\""
+msgstr "\"Snímek obrazovky\""
+
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "Většina příkazů funguje i v šeptání.\nNapříklad /imitation v záložce šeptání pro PŘEZDÍVKU1,\nje obdobné jako /imitation PŘEZDÍVKA1."
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "Komunikace je často nezbytná pro úspěch v této hře. Můžete komunikovat\nněkolika způsoby: Chatováním, používáním smajlíků (podívejte se výše),\nobchodováním (pomocí kontextového menu pravého kliknutí), \na pomocí šeptání."
+
+msgid "\"Emote shortcut 1\""
+msgstr "\"Zkratka smajlíka  1\""
+
+msgid ""
+" - ##2ignored##9:  You wish to completely ignore this player.  You will not\n"
+"   even see floating text for him or her anymore, nor emotions."
+msgstr " - ##2ignorování##9:  Přejete si kompletně ignorovat tohoto hráče. \n                                     Neuvidíte od něj ani plovoucí text a smajlíky."
+
+msgid "\"Outfit shortcut 13\""
+msgstr "\"Zkratka výbavy 13\""
+
+msgid "/sethome - set home position."
+msgstr "/sethome - nastaví domácí pozici."
+
+msgid ""
+" You can improve your skills by increasing job level. Each job level\n"
+" gives you 1 point to spend on basic skills."
+msgstr "Můžete vylepšit své dovednosti zvýšením své pracovní úrovně. Každá pracovní úroveň\nvám dá 1 bod pro použití na základních dovednostech."
+
+msgid "/me text - send text to chat as /me command in irc."
+msgstr "/me text - pošlete text do chatu jako s použitím příkazu /me na irc."
+
+msgid "\"Chat window\""
+msgstr "\"Chatové okno\""
+
+msgid "\"Emote shortcut 10\""
+msgstr "\"Zkratka smajlíka 10\""
+
+msgid "\"Item shortcut 14\""
+msgstr "\"Zkratka předmětu 14\""
+
+msgid "\"Ignore input 1\""
+msgstr "\"Ignorovat vstup 1\""
+
+msgid "Mana Contributors"
+msgstr "Přispěvatelé Mana"
+
+msgid "Content devs"
+msgstr "Vývojaři obsahu"
+
+msgid "/query NICK, /q NICK - open new whisper tab for nick."
+msgstr "/query PŘEZDÍVKA, /q PŘEZDÍVKA - otevře novou záložku šeptání pro přezdívku."
+
+msgid ""
+" - ##2allow whispers##9: Do you wish to allow arbitrary players to send\n"
+"   private messages to you in-game?"
+msgstr " - ##2povolit šeptání##9: Přejete si povolit určitým hráčům šeptat k vám?"
+
+msgid "\"Item shortcut 5\""
+msgstr "\"Zkratka předmětu  5\""
+
+msgid "/all - show visible beings list in debug tab."
+msgstr "/all - zobraz seznam viditelných objektů v záložce pro debug."
+
+msgid "\"Emote shortcut 7\""
+msgstr "\"Zkratka smajlíka  7\""
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "/present - print visible players number to chat."
+msgstr "/present - vypíše počet viditelných hráčů do chatu."
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr "Webová stránka: @@http://manaplus.org/|http://manaplus.org/@@"
+
+msgid "/addattack NAME - add monster to attack list."
+msgstr "/addattack JMÉNO - přidat monstrum do seznamu pro útok."
+
+msgid "For other server look servers pages for support."
+msgstr "Pro další servery a pro podporu se podívejte na stránku serverů."
+
+msgid ""
+"##2ManaPlus##9 is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr "##2ManaPlus##9 je vážným úsilím o vytvoření inovujícího, svobodného \n a open source kliento pro MMORPG hry. ManaPlus používá\n 2D grafiku \n a cílem je vytvořit veliký a rozmanitý interaktivní svět. \n Je vyvýjen pod GPL licencí, která zaručuje že vám tato hra nikdy neuteče z pod rukou."
+
+msgid "\"Target closest monster\""
+msgstr "\"Zaměřit nejbližší monstrum\""
+
+msgid "\"Emote shortcut 2\""
+msgstr "\"Zkratka smajlíka  2\""
+
+msgid "\"Outfit shortcut 6\""
+msgstr "\"Zkratka výbavy  6\""
+
+msgid "/setdrop N - set drop counter to requested value."
+msgstr "/setdrop N - nastavit počítadlo upuštění na danou hodnotu."
+
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr "/dumpogl - vypíše všecky OpenGL proměnné do souboru se záznamy."
+
+msgid "/outfit N - wear outfit number N."
+msgstr "/outfit N - obleče výbavu číslo N."
+
+msgid "Visit IRC channel:"
+msgstr "Navštívte IRC kanál:"
+
+msgid "\"Shop window\""
+msgstr "\"Okno Obchodu\""
+
+msgid "/createparty NAME - create party with selected name."
+msgstr "/createparty JMÉNO -vytvoří partu s daným jménem."
+
+msgid "\"Move down\""
+msgstr "\"Pohyb dolů\""
+
+msgid "/heal NICK - heal nick."
+msgstr "/heal PŘEZDÍVKA - uzdrav hráče s uvedenou přezdívkou."
+
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr "/emotepet N - použije smajlíka N pro vašeho mazlíčka."
+
+msgid "\"Setup window\""
+msgstr "\"Okno nastavení\""
+
+msgid "/removeattack NAME - remove monster from attack list."
+msgstr "/removeattack JMÉNO - odstraní monstrum ze seznamu k útoku."
+
+msgid "\"Set direction up\""
+msgstr "\"Nastavit směr dolů\""
+
+msgid "/dumpe - dump environment variables into chat."
+msgstr "/dumpe - vypíše proměnné prostředí do chatu."
+
+msgid "Instructions"
+msgstr "Instrukce"
+
+msgid ""
+"If client working very slow, you can improve speed\n"
+"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+msgstr "Pokud je klient zpomalený, můžete jej zrychlit \npomocí toho návodu: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+
+msgid "\"Kills stats window\""
+msgstr "\"Okno statistik zabití\""
+
+msgid ""
+"You can do basic searching in help by using command\n"
+"##2?text"
+msgstr "V nápovědě můžete používat jednoduché hledání použití příkazu\n##2?text"
+
+msgid "\"Change move to target type\""
+msgstr "\"Změnit typ pohybu k cíly\""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr "/dumpmods - vypíše všecky povolené mody do chatu."
+
+msgid "\"Enable/disable trading\""
+msgstr "\"Zakázet/Povolit obchodování\""
+
+msgid "\"Toggle camera mode\""
+msgstr "\"Přepnout režim kamery\""
+
+msgid "/unignore NICK - Remove nick from ignore list."
+msgstr "/unignore PŘEZDÍVKA - odstraní přezdívku ze seznamu ignorovaných."
+
+msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr "Pokud máte problémy, prohlédněte si nejdříve FAQ - často kladené dotazy.\nPokud nemůžete najít řešení vašeho problému tam, neváhejte se\npodívat na sekci Bugs/Support ve fóru:"
+
+msgid "IGNORING COMMUNICATION"
+msgstr "IGNOROVANÍ KOMUNIKACE"
+
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr "/wait JMÉNO - zapne čekání na monstrum nebo hráče s daným jménem."
+
+msgid "SUPPORT"
+msgstr "PODPORA"
+
+msgid "\"Outfit shortcut 10\""
+msgstr "\"Zkratka výbavy 10\""
+
+msgid "Look this page for help and downloads:"
+msgstr "Na této stránce naleznete soubory ke stažení a pomoc:"
+
+msgid "COMMUNICATION:"
+msgstr "KOMUNIKACE:"
+
+msgid "Other skills:"
+msgstr "Ostatní  dovednosti:"
+
+msgid ""
+" - ##2save player list##9: Should your acquaintance list be saved when you\n"
+"   quit the game?  If you enable this option, your list will survive when you\n"
+"   quit and re-start."
+msgstr " - ##2uložit seznam vztahů##9: Má být seznam vašich známostí ukládán při ukončení hry? \n                                       Pokud povolíte toto nastavení, váš seznam přežije ukončení hry a restart."
+
+msgid ""
+"You can use mumble voice chat for talking with other players.\n"
+"Start mumble before client start and enable mumble in settings."
+msgstr "Můžete používat hlasový chat mumble pro hlasovou komunikaci s jinými hráči.\nZapněte mumble před tím než zapnete klienta a poté povolte mumble v nastavení."
+
+msgid "\"Move up\""
+msgstr "\"Pohyb nahoru\""
+
+msgid "Here contributors from parent projects"
+msgstr "Zde jsou přispěvatelé z mateřských projektů"
+
+msgid "\"Item shortcut 4\""
+msgstr "\"Zkratka předmětu  4\""
+
+msgid ""
+"You can restore yellow bar settings,\n"
+"by right click on it and select in context menu \"Reset yellow bar\"."
+msgstr "Můžete obnovit nastavení žlutého pruhu,\npomocí pravého klinutí na něj a vybrání \"Resetovat žlutý pruh\"."
+
+msgid "/who - print online players number to chat."
+msgstr "/who - vypíše počet  hráčů co jsou připojeni do chatu."
+
+msgid "/createitems - open dialog for creating items."
+msgstr "/createitems - otevře dialog pro vytváření předmětů."
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway ZPRÁVA - nastavit/zrušit pseudo away režim."
+
+msgid "Sources:"
+msgstr "Zdrojový kód:"
+
+msgid "/uptime - show client uptime."
+msgstr "/uptime - zobrazí jak dlouho byl klient spuštěn."
+
+msgid "\"Who is online window\""
+msgstr "\"Okno kdo je připojen\""
+
+msgid "\"Sit\""
+msgstr "\"Posadit se\""
+
+msgid "/dumpg - dump graphics and some other settings to chat."
+msgstr "/dumpg - vypíše grafická a některá další nastavení do chatu."
+
+msgid "\"Deactivate chat input\""
+msgstr "\"Vypnout vstup chatu\""
+
+msgid "/trade NICK - start trade with nick."
+msgstr "/trade PŘEZDÍVKA - započne obchod s hráčem dané přezdívky."
+
+msgid "/imitation NICK - start imitation mode."
+msgstr "/imitation PŘEZDÍVKA - spustí imitační režim."
+
+msgid "\"Outfit shortcut 5\""
+msgstr "\"Zkratka výbavy  5\""
+
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Můžete imitovat jiné hráče vybráním \"Imitace\" v kontextovém menu hráče\nnebo napsáním příkazu /imitate přezdívka do chatu."
+
+msgid ""
+"You can hide/show bars and buttons by right click and select menu item."
+msgstr "Můžete zobrazit či skrýt pruhy a tlačítka pomocí pravého kliknutí a vybráním dané položky menu."
+
+msgid "\"Scroll chat down\""
+msgstr "\"Rolovat chat dolů\""
+
+msgid "##2Trade:##9 enables the ability to trade with others."
+msgstr "##2Obchod:##9 povoluje obchod s dalšími hráči."
+
+msgid "Contributors to client development"
+msgstr "Přispěvatelé k vývoji klienta"
+
+msgid "\"Outfit shortcut 11\""
+msgstr "\"Zkratka výbavy 11\""
+
+msgid "\"Move right\""
+msgstr "\"Pohyb vpravo\""
+
+msgid "\"Item shortcut 11\""
+msgstr "\"Zkratka předmětu 11\""
+
+msgid "\"Item shortcut 10\""
+msgstr "\"Zkratka předmětu 10\""
+
+msgid "ABOUT MANAPLUS"
+msgstr "O MANAPLUS"
+
+msgid "\"Select OK\""
+msgstr "\"Vybrat OK\""
+
+msgid "MacOSX porting"
+msgstr "Portování na MacOSX"
+
+msgid ""
+"About yellow bar you can read here:\n"
+"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+msgstr "Více informací o žluté liště najdete zde:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+
+msgid "\"Move to target\""
+msgstr "\"Přejít k cíli\""
+
+msgid "/item 0 - disable party item sharing options."
+msgstr "/item 0 - zakázat sdílení předmětů v partě."
+
+msgid "/drop - drop N items from 0 slot."
+msgstr "/drop - upustí N předmětů z místa 0."
+
+msgid "\"Enable / disable away mode\""
+msgstr "\"Zapnout/Vypnout Away mód\""
+
+msgid "INDEX"
+msgstr "OBSAH"
+
+msgid "\"Chat auto complete\""
+msgstr "\"Autodoplňování v chatu\""
+
+msgid "/kick NICK - kick someone from the party you are in."
+msgstr "/kick PŘEZDÍVKA - vykopne hráče z vaší party."
+
+msgid "\"Commands window\""
+msgstr "\"Okno příkazů\""
+
+msgid "/ignoreall - add all whispers to ignore list."
+msgstr "/ignoreall - přidá veškeré šeptání do seznamu ignorovaných."
+
+msgid "\"Copy outfit\""
+msgstr "\"Kopírovat výstroj\""
+
+msgid "Server news"
+msgstr "Novinky serveru"
+
+msgid "/ignore NICK - add nick to ignore list."
+msgstr "/ignore PŘEZDÍVKA - přídá přezdívku do seznamu ignorovaných."
+
+msgid "\"Item shortcuts Key\""
+msgstr "\"Zkratková klávesa předmětů\""
+
+msgid "\"Disable / enable game modifier keys\""
+msgstr "\"Zakázat / Povolit klávesy modifikce hry\""
+
+msgid "\"Change crazy Move mode\""
+msgstr "\"Změnit mód šílených pohybů\""
+
+msgid "/where - print current player position to chat."
+msgstr "/where - vypíše současnou pozici hráče do chatu."
+
+msgid "\"Attack\""
+msgstr "\"Útok\""
+
+msgid "/outfit next - wear next outfit."
+msgstr "/outfit next - obleče další výbavu."
+
+msgid "/magicattack - attack target with magic."
+msgstr "/magicattack - zaútočí na cíl magií."
+
+msgid ""
+"You can set away mode,\n"
+"by type in chat command /away"
+msgstr "Můžete nastavit away režim,\nnapsáním příkazu /away do chatu."
+
+msgid "/move X Y - move to X,Y position in short distance."
+msgstr "/move X Y - přesune postavu nejkratší cestou na souřadnice X,Y."
+
+msgid "##2Party Level1:##9 enables a char to join a party."
+msgstr "##2Úroveň Party 1:##9 umožňuje postavě přidat se do party."
+
+msgid "\"Item shortcut 3\""
+msgstr "\"Zkratka předmětu  3\""
+
+msgid "\"Change move type\""
+msgstr "\"Změnit typ pohybu\""
+
+msgid "Magic skills:"
+msgstr "Magické dovednosti:"
+
+msgid "/addignoreattack NAME - add monster to ignore attack list."
+msgstr "/addignoreattack JMÉNO - přidá monstrum do seznamu ignorvaných pro útok."
+
+msgid "Android porting"
+msgstr "Portování na Android"
+
+msgid "Tabs"
+msgstr "Záložky"
+
+msgid "\"Social window\""
+msgstr "\"Okno společenství\""
+
+msgid "\"Hide windows\""
+msgstr "\"Skrýt okna\""
+
+msgid "\"Outfit shortcut 4\""
+msgstr "\"Zkratka výbavy  4\""
+
+msgid "Chat commands"
+msgstr "Příkazy chatu"
+
+msgid "\"Did you know window\""
+msgstr "\"Okno vědeli jste\""
+
+msgid "Trade"
+msgstr "Obchod"
+
+msgid "/blacklist NICK - add nick to blacklist relation list."
+msgstr "/blacklist PŘEZDÍVKA - přidá přezdívku na černou listinu vztahů."
+
+msgid "\"Change map view mode\""
+msgstr "\"Změnit režim zobrazení mapy\""
+
+msgid "\"Close chat tab\""
+msgstr "\"Zavřít záložku chatu\""
+
+msgid "\"Item shortcut 6\""
+msgstr "\"Zkratka předmětu  6\""
+
+msgid ""
+" - ##2neutral##9:  As far as the game is concerned, this is the same as not\n"
+"   having the player listed:  the player may chat with you, but may only trade\n"
+"   or whisper if you have this option allowed for everyone."
+msgstr " - ##2neutrální##9:  Tak jak je hra nastavena je toto jako by hráč na seznamu nebyl:  \n                      Hráč s vámi může chatovat, ale obchodovat s vámi a šeptat \n                      vám může jen když to máte dovoleno pro všechny."
+
+msgid "Download"
+msgstr "Stáhnout"
+
+msgid "Other linux:"
+msgstr "Jiný linux:"
+
+msgid ""
+" - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
+"   message your in private, or trade with you at any point."
+msgstr " - ##2přítel##9:  Považujete hráče za přítele.  Hráč s vámi může chatovat,\n               šeptat vám, nebo s vámi kdykoliv obchodovat."
+
+msgid "Art or images contributors"
+msgstr "Umělečtí přispěvatelé"
+
+msgid "\"Target player\""
+msgstr "\"Zaměřit hráče\""
+
+msgid "/dropn - drop N items from any slot."
+msgstr "/dropn - Upustí N předmětů z jakéhokoli slotu."
+
+msgid "/enableaway - enable away messages in current tab."
+msgstr "/enableaway - Povolí away zprávy v aktuální záložce."
+
+msgid "##2ManaPlus version: ##6%VER%"
+msgstr "##2ManaPlus verze: ##6%VER%"
+
+msgid "/enemy NICK - add nick to enemyes list."
+msgstr "/enemy PŘEZDÍVKA - přidá přezdívku do seznamu nepřátel."
+
+msgid ""
+" - ##2disregarded##9:  You wish to disregard this player, meaning that his or\n"
+"   her chat messages are not logged and trade requests and whispers are\n"
+"   ignored."
+msgstr " - ##2přehlížení##9:  Přejete si přehlížet tohot hráče, což znamená že jeho zprávy \n                      do chatu nejsou zaznamenány a šeptání s obchodem ignorovány."
+
+msgid "\"Debug window\""
+msgstr "\"Debugovací okno\""
+
+msgid "/uploadlog - upload log into pastebin service."
+msgstr "/uploadlog - nahraje záznamy na pastebin."
+
+msgid "ManaPlus Contributors"
+msgstr "Přispěvatelé ManaPlus"
+
+msgid "\"Emote shortcut 5\""
+msgstr "\"Zkratka smajlíka  5\""
+
+msgid "\"Copy equiped to Outfit\""
+msgstr "\"Zkopírovat výzbroj do výbavy\""
+
+msgid "Basic skills:"
+msgstr "Základní dovednosti:"
+
+msgid "/leave - leave the party you are in."
+msgstr "/leave - opustíte partu ve které jste."
+
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Můžete nakupovat  a prodávat předměty z obchdů ostatních hráčů.\nKlikněte pravým tlačítkem na hráče a vyberte \"Koupit\" nebo \"Prodat\"."
+
+msgid "/erase NICK - add nick to erased list."
+msgstr "/erase PŘEZDÍVKA - přidá přezdívku do seznamu smazaných."
+
+msgid "/pricesave - save shop price to disc."
+msgstr "/pricesave - uloží ceny obchodu na disk."
+
+msgid "\"Pickup\""
+msgstr "\"Zvednout\""
+
+msgid "\"Status window\""
+msgstr "\"Statusové okno\""
+
+msgid "\"Item shortcut 2\""
+msgstr "\"Zkratka předmětu  2\""
+
+msgid ""
+"##2               SDL, SDL_image, SDL_mixer (Media framework)\n"
+"##2                     SDL_net (Networking framework)\n"
+"##2                        Guichan (GUI framework)\n"
+"##2                   libxml2 (XML parsing and writing)\n"
+"##2                          PhysFS (Data files)\n"
+"##2                        libcurl (HTTP downloads)\n"
+"##2                            zlib (Archives)"
+msgstr "##2               SDL, SDL_image, SDL_mixer (Rámec pro média)\n##2                     SDL_net (Síťvý rámec)\n##2                        Guichan (Rámec ovládání)\n##2                   libxml2 (XML čtení a zápis)\n##2                          PhysFS (Datová pole)\n##2                        libcurl (HTTP stahování)\n##2                            zlib (Archivy)"
+
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr "/cleangraphics - odstarní veškerou grafiku z vyrovnávací paměti. Užitečné pro vývojaře obsahu."
+
+msgid "/friend NICK, /befriend NICK - add nick to friends list."
+msgstr "/friend PŘEZDÍVKA, /befriend PŘEZDÍVKA - přidá přezdívku do seznamu přátel."
+
+msgid "\"Change follow mode\""
+msgstr "\"Změnti režim sledování\""
+
+msgid "\"Scroll chat up\""
+msgstr "\"Rolovat chat nahoru\""
+
+msgid ""
+"##9 This file lists all contributors up to the current release. Check the wiki\n"
+"##9 for the currently active development team."
+msgstr "##9 Tento soubor obsahuje všecky přispěvatele až do současného vydání, pro sezname aktivních \n##9vývojařů se podívejte na wiki."
+
+msgid "/item - show party item sharing options."
+msgstr "/item - zobrazí nastavení sdílení předmětů v partě."
+
+msgid "\"Inventory window\""
+msgstr "\"Okno inventáře\""
+
+msgid "Contributors to client/server development"
+msgstr "Přispěvatelé k vývoji klientu a/nebo serveru."
+
+msgid "\"Quick heal target or self\""
+msgstr "\"Rychle uzdravit cíl nebo sebe\""
+
+msgid "\"Change pickup type\""
+msgstr "\"Změnti typ sběru\""
+
+msgid "\"Use #itenplz spell\""
+msgstr "\"Použít kouzlo #itenplz\""
+
+msgid "move key"
+msgstr "pohybová klávesa"
+
+msgid "\"Item shortcut 13\""
+msgstr "\"Zkratka předmětu 13\""
+
+msgid "Skills"
+msgstr "Dovednosti"
+
+msgid "\"Outfit shortcut 3\""
+msgstr "\"Zkratka výbavy  3\""
+
+msgid "\"Quick drop N items\""
+msgstr "\"Rychle upustit N předmětů\""
+
+msgid "Themes:"
+msgstr "Témata:"
+
+msgid ""
+"/msg NICK text, /whisper NICK text, /w NICK text - send whisper message to "
+"nick."
+msgstr "/msg PŘEZDÍVKA text, /whisper PŘEZDÍVKA text, /w PŘEZDÍVKA text - pošle šeptaný vzkaz dané přezdívce."
+
+msgid "/movetotarget - move to target position."
+msgstr "/movetotarget - přesune postavu na cílovou pozici."
+
+msgid "\"Emote shortcut 14\""
+msgstr "\"Zkratka smajlíka 14\""
+
+msgid "/open URL - open url in browser."
+msgstr "/open URL - otevře URL v prohlížeči."
+
+msgid "Commands"
+msgstr "Příkazy"
+
+msgid "WINDOWS"
+msgstr "OKNA"
+
+msgid "\"Outfit shortcut 9\""
+msgstr "\"Zkratka výbavy  9\""
+
+msgid "\"Emote shortcut 4\""
+msgstr "\"Zkratka smajlíka  4\""
+
+msgid "\"Stop Attack\""
+msgstr "\"Zastavit útok\""
+
+msgid ""
+" The player list lists all of your acquaintances.  They are categorised as one\n"
+" of the following:"
+msgstr "Seznam hráčů vede všecky vaše známosti.\n Jsou řazeny podle jednoho možných kritérií:"
+
+msgid "/cleanfonts - remove all cached render strings."
+msgstr "/cleanfonts - odstraní všecky vykreslené řetězce z vyrovnávací paměti."
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr "/dumpgl - zobrazí verzi OpenGL v chatu."
+
+msgid "/outfit prev - wear previous outfit."
+msgstr "/outfit prev - obleče předchozí výbavu."
+
+msgid "\"Crazy moves\""
+msgstr "\"Šílené pohyby\""
+
+msgid "Powered By"
+msgstr "Provozováno"
+
+msgid "##2Party level2:##9 enables a char to create a party."
+msgstr "##2Úroveň party 2:##9 umožní postavě vytvářet party."
+
+msgid "/target NICK - select nick as target. Can be monster or player nick."
+msgstr "/target PŘEZDÍVKA - vybere přezdívku jako cíl. Může to být monstrum nebo jiný hráč."
+
+msgid "To type chat message, press ###keyChat;"
+msgstr "Pro napsání zprávy do chatu, zmáčkněte ###keyChat;"
+
+msgid "Translators"
+msgstr "Překladatelé"
+
+msgid "MOUSE:"
+msgstr "MYŠ:"
+
+msgid "\"Next chat tab line\""
+msgstr "\"Řádek další záložky chatu\""
+
+msgid "\"Set direction right\""
+msgstr "\"Nastavit směr vpravo\""
+
+msgid "/announce MESSAGE - show global message."
+msgstr "/announce ZPRÁVA - zobrazí globální oznámení."
+
+msgid "Player relations"
+msgstr "Vztahy hráče"
+
+msgid "Search error"
+msgstr "Chyba hledání"
+
+msgid ""
+"You can copy value from any bar,\n"
+"by right click on it and select in context menu \"Copy to chat\"."
+msgstr "Můžete zkopírovat hodnotu z jakéhokoliv pruhu\na to kliknutím pravým tlačítkem a vybráním \"Zkopírovat do chatu\"."
+
+msgid "/closeall - close all whispers."
+msgstr "/closeall - zavře všechna šeptání."
+
+msgid "/exp 1 - enable party experience sharing options."
+msgstr "/exp 1 - povolí sdílení zkušeností v partě."
+
+msgid "COMMANDS"
+msgstr "PŘÍKAZY"
+
+msgid "\"Previous chat tab\""
+msgstr "\"Předchozí záložka chatu\""
+
+msgid "/serverunignoreall - unignore all whispers on server side."
+msgstr "/serverunignoreall - odignorovat všechno šeptání na straně serveru"
+
+msgid "##9Magic skills can be obtain by doing quests and missions in game."
+msgstr "##9Magické dovednosti mouhou být získány během hry pomocí plnění různých úkolů."
+
+msgid "\"Skill window\""
+msgstr "\"Okno dovedností\""
+
+msgid "\"Move to home location\""
+msgstr "\"Přejít na domácí místo\""
+
+msgid "\"Toggle chat\""
+msgstr "\"Přepnout chat\""
+
+msgid "/talkpet TEXT - talk from your pet."
+msgstr "/talkpet TEXT - mluvte skrze svého mazlíčka."
+
+msgid "\"Change attack type\""
+msgstr "\"Změnit typ útoku\""
+
+msgid "/clear - clear current chat tab."
+msgstr "/clear - vyčistí aktuální záložku chatu."
+
+msgid "\"On / off audio\""
+msgstr "\"Zapnout/Vypnout audio\""
+
+msgid "\"Emote shortcut 6\""
+msgstr "\"Zkratka smajlíka  6\""
+
+msgid "\"Outfit shortcut 2\""
+msgstr "\"Zkratka výbavy  2\""
+
+msgid "You can change any key in keyboard settings."
+msgstr "Můžete změnit jakoukoliv klávesovou zkratku v nastavení klávesnice."
+
+msgid "/dirs - show client dirs in debug chat tab."
+msgstr "/dirs - zobrazí klintské složky v debugové záložce chatu."
+
+msgid "/movetohome - move to home position."
+msgstr "/movetohome - přesune na domácí pozici."
+
+msgid "/disconnect - quick disconnect from server."
+msgstr "/disconnect - rychle odpojí od serveru."
+
+msgid "\"Switch quick drop counter\""
+msgstr "\"Přepni počet rychlého upuštění\""
+
+msgid "\"Previous chat tab line\""
+msgstr "\"Řádek předchozí záložky chatu\""
+
+msgid "\"Emote shortcut 13\""
+msgstr "\"Zkratka smajlíka 13\""
+
+msgid "/disregard NICK - add nick to disregarded list."
+msgstr "/disregard PŘEZDÍVKA - přidá přezdívku do seznamu přehlížených."
+
+msgid "\"Item shortcut 1\""
+msgstr "\"Zkratka předmětu  1\""
+
+msgid "\"Outfit shortcut 8\""
+msgstr "\"Zkratka výbavy  8\""
+
+msgid "Manaplus Developers"
+msgstr "Vývojaři ManaPlus"
+
+msgid "\"Change imitation mode\""
+msgstr "\"Změnit mód imitace\""
+
+msgid ""
+"##2ManaPlus##9 is extended client based on old code from ##2Mana##9 client.\n"
+" Added many features, improved perfomance, stability, security and more."
+msgstr "##2ManaPlus##9 je rozšířený klient založený na kódu z ##2Mana##9 klienta.\nPřidává mnoho možností, lepší výkon, stabilitu, bezpečnost a další vlastnosti."
+
+msgid "##9Other skills can be obtain by doing quests and missions in game."
+msgstr "##9Jiné dovednosti mohou být získány děláním různých úkolů ve hře."
+
+msgid "/exp - show party experience sharing options."
+msgstr "/exp - zobrazí nastavení sdílení zkušeností pro partu."
+
+msgid "\"Reset video mode to safe value\""
+msgstr "\"Resetovat video na bezpečné hodnoty\""
+
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgstr "/undress PŘEZDÍVKA - odstraní veškeré obleční daného hráče. Pouze lokální efekt."
+
+msgid "Other"
+msgstr "Jiné"
+
+msgid ""
+" Otherwise see the @@team|Development Team@@ section to have a list of\n"
+" developers and how to contact them."
+msgstr "Jinak se podívejte do sekce @@team|Development Team@@ pro seznam\nvývojařů a způsoby jak je kontaktovat."
+
+msgid "\"Outfit shortcut 14\""
+msgstr "\"Zkratka výbavy 14\""
+
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr "/uploadconfig - nahraje hlavní nastavení na pastebin."
+
+msgid "\"Quick drop N items from 0 slot\""
+msgstr "\"Rychle zahoď N předmětů ze slotu 0\""
+
+msgid "/enablehighlight - enable highlight in current tab."
+msgstr "/enablehighlight - povolit zvýraznění v aktuální záložce."
+
+msgid "\"Emote shortcut window\""
+msgstr "\"Okno zkratek smajlíků\""
+
+msgid "\"Bot checker window\""
+msgstr "\"Okno kontroly botů\""
+
+msgid "/disableaway - disable away messages in current tab."
+msgstr "/disableaway - zakáže zobrazování away zprávy v aktuální záložce."
+
+msgid ""
+"/mail NICK MSG - send offline message to NICK. Working only in tmw server."
+msgstr "/mail PŘEZDÍVKA ZPRÁVA - poslat offline zprávu přezdívce. Funguje pouze na tmw serveru."
+
+msgid "DOWNLOADS"
+msgstr "STAŽENÉ SOUBORY"
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr "/disablehighlight - zakáže zvýrazňování v aktuální záložce."
+
+msgid "\"Item shortcut 15\""
+msgstr "\"Zkratka předmětu 15\""
+
+msgid "About The Mana World"
+msgstr "O The Mana World"
+
+msgid "/testparticle FILENAME - set test particle on player."
+msgstr "/testparticle NÁZEV_SOUBORU - otestuje částicový efekt na hráči."
+
+msgid "\"Smilie\""
+msgstr "\"Smajlík\""
+
+msgid "Whispers commands"
+msgstr "Příkazy šeptání"
+
+msgid ""
+" There you will find a list of all players you are acquainted with, as well as\n"
+" several configuration options:"
+msgstr "Zde najdete seznam všech hráčů se kterými se znáte a stejně tak \nněkolik configuračních nastavení:"
+
+msgid "\"Use magic attack\""
+msgstr "\"Použít magický útok\""
+
+msgid ""
+"You can see other player equiped items,\n"
+"by right click on player and select in context menu \"Show Items\"."
+msgstr "Můžete vidět předměty oblečené ostatními hráči,\nklepnutím pravým tlačítkem myši a vybráním kontextového menu \"Zobrazit předměty\"."
+
+msgid "Whispers"
+msgstr "Šeptání"
+
+msgid "/url URL - insert url into chat."
+msgstr "/url URL - vloží url do chatu."
+
+msgid "\"Wear outfit\""
+msgstr "\"Obléct výstroj\""
+
+msgid "emote key"
+msgstr "klávesa smajlíka"
+
+msgid "Search results"
+msgstr "Výsledky hledání"
+
+msgid "/help - show small help about chat commands. "
+msgstr "/help - zobrazí malou nápovědu ohledně příkazů chatu. "
+
+msgid "\"Item shortcut 9\""
+msgstr "\"Zkratka předmětu  9\""
+
+msgid ""
+"You can set any client resolution. In settings in video tab,\n"
+"click on \"custom\" and enter for example: 900x500 and press ok."
+msgstr "Můžete si nastavit vlastní rozlišení klienta. V nastavení v záložce Video\nkliněte na \"vlastní\", napište na příklad 900x500 a zmáčkněte ok."
+
+msgid "Main development"
+msgstr "Hlavní vývoj"
+
+msgid "\"Help window\""
+msgstr "\"Okno nápovědy\""
+
+msgid "/attack - attack target."
+msgstr "/attack - zaútočí na cíl."
+
+msgid "\"Outfit shortcut 1\""
+msgstr "\"Zkratka výbavy  1\""
+
+msgid ""
+" You may find that not all communication is to your liking.  While most people\n"
+" are nice, some may offend you or try to make your life harder-- since this is\n"
+" an open game, there is nothing the developers can do to prevent this."
+msgstr "Můžete zjistit že ne všecka komunikace je vám příjemná. Přestože většina hráčů\nje příjemná, někteří vás mohou urážet a nebo vám jinak ztěžovat život - jelikož toto je \notevřená hra, není možné tomuto zabránit."
+
+msgid "About"
+msgstr "O ManaPlus"
+
+msgid "\"Change attack weapon type\""
+msgstr "\"Změnit druh útočné zbraně\""
+
+msgid "\"Emote shortcut 12\""
+msgstr "\"Zkratka smajlíka 12\""
+
+msgid "\"Outfit shortcut 15\""
+msgstr "\"Zkratka výbavy 15\""
+
+msgid "Windows"
+msgstr "Okna"
+
+msgid "\"Ignore input 2\""
+msgstr "\"Ignorovat vstup 2\""
+
+msgid "\"Emulate right click from keyboard\""
+msgstr "\"Emulovat pravý klik z klávesnice\""
+
+msgid "\"Set home location/set arrow\""
+msgstr "\"Nastavit domácí místo/nastavit šipku\""
+
+msgid "\"Set direction left\""
+msgstr "\"Nastavit směr vlevo\""
+
+msgid "\"Move left\""
+msgstr "\"Pohyb vlevo\""
+
+msgid "##2Emote:##9 enables the ability to express emotions."
+msgstr "##2Smajlíci:##9 povoluje schopnost dělat smajlíky."
+
+msgid "\"Item shortcut window\""
+msgstr "\"Okno zkratek předmětů\""
+
+msgid "\"Item shortcut 7\""
+msgstr "\"Zkratka předmětu  7\""
+
+msgid "\"Emote shortcut 8\""
+msgstr "\"Zkratka smajlíka  8\""
+
+msgid "\"Minimap window\""
+msgstr "\"Okno minimapy\""
+
+msgid "\"Equipment window\""
+msgstr "\"Okno výbavy\""
+
+msgid "/serverignoreall - ignore all whispers on server side."
+msgstr "/serverignoreall - ignoruje veškeré šeptání na straně serveru."
+
+msgid "/notice TEXT - set notice guild text."
+msgstr "/notice TEXT - nastaví text upozornění gildy."
+
+msgid "\"Emote shortcut 3\""
+msgstr "\"Zkratka smajlíka  3\""
+
+msgid ""
+" However, you can protect yourself from such players by ignoring them.  Right-\n"
+" click on them to bring up the context menu, then select `Ignore' or\n"
+" `Disregard' (see below).  You can fine-tune your player relations in the\n"
+" `Setup' menu, which lists all the players you have added to it.  To open this\n"
+" menu, select `Setup' in the upper right corner of the screen, then `Relations'."
+msgstr "Přesto se ale můžete proti těmto hráčům bránit tím že je budete ignorovat.\nKlikněte pravým tlačítkem myši a v kontextovém menu vyberte 'Ignorovat' nebo\n'Přehlížet' (viz níže). Podrobně můžete upravovat vaše vztahy s ostatními hráči\nv menu 'Nastavení', kde můžete vidět vškeré vztahy s hráči které jste vytvořili.\nPro přístup k tomuto klikněte na tlačítko nastavení v pravém horním rohu a vyberte 'Vztahy'."
+
+msgid "/dumpt - dump tests info into chat."
+msgstr "/dumpt - vypíše testy do chatu."
+
+msgid "Different patches"
+msgstr "Různé opravy"
+
+msgid "\"Switch magic attack\""
+msgstr "\"Změnit magický útok\""
+
+msgid "/navigate x y - move to position x,y in current map in any distance."
+msgstr "/navigate x y - přesune se na jakkoli vzdálenou pozici X Y na aktuální mapě."
+
+msgid "SKILLS"
+msgstr "DOVEDNOSTI"
+
+msgid "Guild chat commands"
+msgstr "Cahtové příkazy pro gildy"
+
+msgid "Actions"
+msgstr "Akce"
+
+msgid "\"Item shortcut 12\""
+msgstr "\"Zkratka předmětu 12\""
+
+msgid "\"Move to navigation point\""
+msgstr "\"Přesunout k navigačnímu bodu\""
+
+msgid "Sound effects"
+msgstr "Zvukové efekty"
+
+msgid "SHORTCUTS:"
+msgstr "ZKRATKY:"
+
+msgid "\"Talk\""
+msgstr "\"Mluvit\""
+
+msgid ""
+" Left click to execute default action: walk, pick up an item, attack a monster\n"
+" and talk to NPCs (be sure to click on their feet). Right click to show up a\n"
+" context menu. Holding [Left Shift] prevents from walking when attacking."
+msgstr "Klikněte levým tlačítkem myši pro výchozí akci: chůze, zvedání předmětů, \nútok na monstrum a mluvení s NPC (klikejte na jejich nohy). \nKliknutí pravým tlačítkem myši zobrazuje kontextové menu. \nDržení [Levého Shiftu] zamezuje chození při útoku."
+
+msgid "/follow NICK - start follow mode."
+msgstr "/follow PŘEZDÍVKA -  spustí režim následování"
+
+msgid "\"Item shortcut 8\""
+msgstr "\"Zkratka předmětu  8\""
+
+msgid "/emote N - use emotion number N."
+msgstr "/emote N - použije smajlíka číslo N."
diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 36b12cdb0..b129dc20d 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,13 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
 msgstr ""
 
 msgid "To read about whispering and other chat commands, look here:"
@@ -38,11 +41,8 @@ msgstr "Du kannst andere Themes auswählen.⏎ Hierfür öffnest du das Einstell
 msgid "\"Target & attack\""
 msgstr ""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr "Die meisten Befehle arbeiten im Flüsterchat.\nZum Beispiel der Befehl '/imitation' im Flüsterchat mit nick1,\nähnlich dem Befehl '/imitation nick1'."
+msgid "/atkhuman - select and attack nearest player."
+msgstr ""
 
 msgid "\"Emote shortcut 11\""
 msgstr ""
@@ -55,19 +55,20 @@ msgid ""
 " window and drop them."
 msgstr " Um einen Gegenstand der Schnellzugriffsleiste hinzuzufügen, klicken Sie auf den\n Gegenstand im Inventarfenster, dann auf das Feld im Schnellzugriffsfenster\n klicken, das mit dem Gegenstand verknüpft werden soll. Um Gegenstände innerhalb\n des Schnellzugriffsfenster neu anzuordnen, klicken Sie einfach auf das Feld und\n ziehen Sie diese zum gewünschten Feld. Um Gegenstände zu entfernen, ziehen Sie\n diese einfach außerhalb des Fensters und lassen es dort fallen."
 
-msgid "\"Ignore input 1\""
+msgid "\"Outfit shortcut 12\""
 msgstr ""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - Info über den Textspeicher anzeigen."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr ""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Man kann andere Spieler nachahmen, indem Sie \"Imitation \"im Spieler-Kontext-Menü\n anklicken oder oder den Chat-Befehl: /imitate playername benutzen."
+msgid "KEYBOARD:"
+msgstr "TASTATUR:"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -83,6 +84,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr ""
 
+msgid "GM"
+msgstr ""
+
 msgid "\"Target NPC\""
 msgstr ""
 
@@ -98,7 +102,7 @@ msgid ""
 "then click on warp what you want."
 msgstr ""
 
-msgid "\"Chat window\""
+msgid "/info - show guild info. Only for native guilds only."
 msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
@@ -113,8 +117,8 @@ msgstr "/addpriorityattack NAME - Monster zur bevorzugten Angriffsliste hinzufü
 msgid "Back to Index"
 msgstr "Zurück zum Index"
 
-msgid "DOWNLOADS"
-msgstr ""
+msgid "\"Quit\""
+msgstr "\"Beenden\""
 
 msgid "THE PLAYER LIST"
 msgstr "Die SPIELERLISTE"
@@ -122,22 +126,43 @@ msgstr "Die SPIELERLISTE"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - Lade Preisliste des eigenen Geschäfts von lokaler Datei."
 
+msgid "Search string not found."
+msgstr "Suchstring nicht gefunden."
+
 msgid "\"Quests window\""
 msgstr ""
 
+msgid "Other contributors"
+msgstr "Weitere Beteiligte"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr ""
 
+msgid "\"Next chat tab\""
+msgstr ""
+
+msgid "Support"
+msgstr "Unterstützung"
+
 msgid "\"Quick drop window\""
 msgstr ""
 
 msgid "\"Screenshot\""
 msgstr ""
 
-msgid "Support"
-msgstr "Unterstützung"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "Die meisten Befehle arbeiten im Flüsterchat.\nZum Beispiel der Befehl '/imitation' im Flüsterchat mit nick1,\nähnlich dem Befehl '/imitation nick1'."
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "Kommunikation ist oft entscheidend für den Erfolg in diesem Spiel. Sie können auf\n verschiedene Arten kommunizieren: Durch Chatten und Gefühle zeigen (siehe oben),\n durch den Handel mit anderen Spielern (Das Kontext-Menü mittels der rechten\n Maustaste aufrufen), und durch das Flüstern."
 
 msgid "\"Emote shortcut 1\""
 msgstr ""
@@ -150,6 +175,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr ""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -158,16 +186,22 @@ msgstr "Sie können Ihre Fähigkeiten durch Erhöhung des Job-Ebene verbessern.\
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me Text - Text senden als - identisch zum /me-Befehl im IRC-Chat."
 
+msgid "\"Chat window\""
+msgstr ""
+
 msgid "\"Emote shortcut 10\""
 msgstr ""
 
 msgid "\"Item shortcut 14\""
 msgstr ""
 
+msgid "\"Ignore input 1\""
+msgstr ""
+
 msgid "Mana Contributors"
 msgstr "Mana Mitwirkende"
 
-msgid "\"Change map view mode\""
+msgid "Content devs"
 msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
@@ -190,6 +224,12 @@ msgstr ""
 msgid "Debug"
 msgstr "Debug"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr "Internetseite: @@http://manaplus.org/|http://manaplus.org/@@"
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NAME - Monster zur normalen Angriffsliste hinzufügen."
 
@@ -215,8 +255,8 @@ msgstr ""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - Setzt Anzahl der gleichzeitig weggeworfenen Gegenstände auf N."
 
-msgid "\"Quit\""
-msgstr "\"Beenden\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr ""
 
 msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - Ausrüstung Nummer N anziehen."
@@ -236,8 +276,8 @@ msgstr ""
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - Heile NICK"
 
-msgid "Contributors to client development"
-msgstr "Mitwirkende der Client Entwicklung"
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr ""
@@ -248,8 +288,8 @@ msgstr "/removeattack NAME - Monster von der Angriffsliste löschen."
 msgid "\"Set direction up\""
 msgstr ""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - print current player position to chat."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr ""
@@ -259,7 +299,7 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr ""
 
-msgid "/exp - show party experience sharing options."
+msgid "\"Kills stats window\""
 msgstr ""
 
 msgid ""
@@ -267,10 +307,11 @@ msgid ""
 "##2?text"
 msgstr "Sie können in der Hilfe die Grundsuche verwenden mit dem Befehl\n##2?text"
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Sie können aus Spielern Geschäften Artikel kaufen oder verkaufen.\n Rechtsklick auf Spieler und wählen Sie \"Kauf\" oder \"Verkauf\"."
+msgid "\"Change move to target type\""
+msgstr ""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr ""
@@ -290,8 +331,8 @@ msgstr " Wenn Sie Probleme haben, dann lesen Sie bitte zuerst die FAQ. Wenn Sie\
 msgid "IGNORING COMMUNICATION"
 msgstr "KOMMUNIKATION IGNORIEREN"
 
-msgid "WINDOWS"
-msgstr "FENSTER"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "UNTERSTÜTZUNG"
@@ -336,6 +377,15 @@ msgstr "Sie können die Einstellungen des gelben Balkens wiederherstellen,\n ind
 msgid "/who - print online players number to chat."
 msgstr "/who - listet alle anwesende Spieler auf."
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway MSG - setzt/löscht den Pseudo-Abwesenheitsmodus"
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - zeigt Ihre aktuelle Onlinezeit (Spielzeit) an."
 
@@ -360,8 +410,10 @@ msgstr "/imitation NICK - Startet den Nachahmungsmodus."
 msgid "\"Outfit shortcut 5\""
 msgstr ""
 
-msgid "KEYBOARD:"
-msgstr "TASTATUR:"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Man kann andere Spieler nachahmen, indem Sie \"Imitation \"im Spieler-Kontext-Menü\n anklicken oder oder den Chat-Befehl: /imitate playername benutzen."
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -373,12 +425,15 @@ msgstr ""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr "Server-Neuigkeiten"
+msgid "Contributors to client development"
+msgstr "Mitwirkende der Client Entwicklung"
 
 msgid "\"Outfit shortcut 11\""
 msgstr ""
 
+msgid "\"Move right\""
+msgstr ""
+
 msgid "\"Item shortcut 11\""
 msgstr ""
 
@@ -402,8 +457,11 @@ msgstr ""
 msgid "\"Move to target\""
 msgstr ""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway MSG - setzt/löscht den Pseudo-Abwesenheitsmodus"
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr ""
@@ -426,8 +484,8 @@ msgstr "/ignoreall - Fügt alle aktiven Flüsterchats zur Ignorierliste hinzu."
 msgid "\"Copy outfit\""
 msgstr ""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Internetseite: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Server news"
+msgstr "Server-Neuigkeiten"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NICK - Fügt NICK zur Ignorierliste hinzu."
@@ -438,14 +496,11 @@ msgstr ""
 msgid "\"Disable / enable game modifier keys\""
 msgstr ""
 
-msgid "Other contributors"
-msgstr "Weitere Beteiligte"
+msgid "\"Change crazy Move mode\""
+msgstr ""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "Kommunikation ist oft entscheidend für den Erfolg in diesem Spiel. Sie können auf\n verschiedene Arten kommunizieren: Durch Chatten und Gefühle zeigen (siehe oben),\n durch den Handel mit anderen Spielern (Das Kontext-Menü mittels der rechten\n Maustaste aufrufen), und durch das Flüstern."
+msgid "/where - print current player position to chat."
+msgstr "/where - print current player position to chat."
 
 msgid "\"Attack\""
 msgstr ""
@@ -453,7 +508,7 @@ msgstr ""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - Nächste Ausrüstung anziehen."
 
-msgid "\"Move right\""
+msgid "/magicattack - attack target with magic."
 msgstr ""
 
 msgid ""
@@ -482,8 +537,8 @@ msgstr "/addignoreattack NAME - Monster zur Nichtangriffsliste hinzufügen."
 msgid "Android porting"
 msgstr "Android Portierung"
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - Im aktuellen Chatfenster kompletten Text löschen."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr ""
@@ -506,6 +561,9 @@ msgstr "Handel"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist NICK - fügt NICK zur schwarzen Liste hinzu."
 
+msgid "\"Change map view mode\""
+msgstr ""
+
 msgid "\"Close chat tab\""
 msgstr ""
 
@@ -521,6 +579,9 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -532,13 +593,16 @@ msgstr "Kunst oder Bilder Mitwirkende"
 msgid "\"Target player\""
 msgstr ""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr ""
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -550,12 +614,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr ""
 
-msgid "\"Next chat tab\""
+msgid "/uploadlog - upload log into pastebin service."
 msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "ManaPlus Mitarbeiter"
 
+msgid "\"Emote shortcut 5\""
+msgstr ""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr ""
 
@@ -565,8 +632,10 @@ msgstr "Grundfähigkeiten"
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr ""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Sie können aus Spielern Geschäften Artikel kaufen oder verkaufen.\n Rechtsklick auf Spieler und wählen Sie \"Kauf\" oder \"Verkauf\"."
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase NICK - Fügt NICK der Löschliste hinzu."
@@ -593,6 +662,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr "##2               SDL, SDL_image, SDL_mixer (Media framework)\n##2                     SDL_net (Networking framework)\n##2                        Guichan (GUI framework)\n##2                   libxml2 (XML parsing and writing)\n##2                          PhysFS (Data files)\n##2                        libcurl (HTTP downloads)\n##2                            zlib (Archives)"
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend NICK, /befriend NICK - Fügt NICK der Freundesliste hinzu."
 
@@ -648,15 +721,21 @@ msgid ""
 "nick."
 msgstr "/msg NICK text, /whisper NICK text, /w NICK text - Sende Flüstermitteilung to NICK."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr ""
 
-msgid "\"Item shortcut 1\""
+msgid "/open URL - open url in browser."
 msgstr ""
 
 msgid "Commands"
 msgstr "Befehle"
 
+msgid "WINDOWS"
+msgstr "FENSTER"
+
 msgid "\"Outfit shortcut 9\""
 msgstr ""
 
@@ -671,7 +750,10 @@ msgid ""
 " of the following:"
 msgstr " Die Spieler-Liste listet alle Ihre eingetragenen Bekannten.\n Sie werden als eine der folgenden Möglichkeiten eingestuft:"
 
-msgid "\"Change attack weapon type\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
 msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
@@ -680,6 +762,9 @@ msgstr "/outfit prev - vorige Ausrüstung anziehen."
 msgid "\"Crazy moves\""
 msgstr ""
 
+msgid "Powered By"
+msgstr "Angetrieben durch"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -701,7 +786,7 @@ msgstr ""
 msgid "\"Set direction right\""
 msgstr ""
 
-msgid "\"Move to home location\""
+msgid "/announce MESSAGE - show global message."
 msgstr ""
 
 msgid "Player relations"
@@ -736,17 +821,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr ""
 
-msgid "\"Kills stats window\""
+msgid "\"Move to home location\""
 msgstr ""
 
 msgid "\"Toggle chat\""
 msgstr ""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr ""
 
-msgid "Manaplus Developers"
-msgstr "Manaplus Entwickler"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - Im aktuellen Chatfenster kompletten Text löschen."
 
 msgid "\"On / off audio\""
 msgstr ""
@@ -763,8 +851,8 @@ msgstr "Sie können die (vor)eingestellte Tastaturbelegung jederzeit\nin den Tas
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - listet die verwendeten Verzeichnisse des Clienten\nim Debug-Chatfenster auf."
 
-msgid "Powered By"
-msgstr "Angetrieben durch"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - schnell vom Server trennen."
@@ -781,12 +869,15 @@ msgstr ""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/disregard NICK - NICK zur Vernachlässigungsliste hinzufügen."
 
-msgid "\"Change crazy Move mode\""
+msgid "\"Item shortcut 1\""
 msgstr ""
 
 msgid "\"Outfit shortcut 8\""
 msgstr ""
 
+msgid "Manaplus Developers"
+msgstr "Manaplus Entwickler"
+
 msgid "\"Change imitation mode\""
 msgstr ""
 
@@ -798,12 +889,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr ""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress NICK - entfernt alle Kleider von NICK. Wirkung ist nur lokal."
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -812,10 +909,13 @@ msgstr " Ansonsten finden Sie im @@team|Development Team@@ Abschnitt eine Liste\
 msgid "\"Outfit shortcut 14\""
 msgstr ""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr ""
 
-msgid "\"Switch pvp attack\""
+msgid "/enablehighlight - enable highlight in current tab."
 msgstr ""
 
 msgid "\"Emote shortcut window\""
@@ -824,17 +924,26 @@ msgstr ""
 msgid "\"Bot checker window\""
 msgstr ""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr "/mail NICK MSG - schickt Offline-Nachricht an Nick. Funktioniert nur im TMW-Server."
 
+msgid "DOWNLOADS"
+msgstr ""
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr ""
 
 msgid "About The Mana World"
 msgstr "Über The Mana World"
 
-msgid "\"Emote shortcut 5\""
+msgid "/testparticle FILENAME - set test particle on player."
 msgstr ""
 
 msgid "\"Smilie\""
@@ -859,8 +968,8 @@ msgstr "Sie können sehen, welche Ausrüstung andere Spieler aktuell verwenden,
 msgid "Whispers"
 msgstr "Flüstern"
 
-msgid "Search string not found."
-msgstr "Suchstring nicht gefunden."
+msgid "/url URL - insert url into chat."
+msgstr ""
 
 msgid "\"Wear outfit\""
 msgstr ""
@@ -903,6 +1012,9 @@ msgstr " Sie werden feststellen, dass nicht die gesamte Kommunikation nach Ihrem
 msgid "About"
 msgstr "Über"
 
+msgid "\"Change attack weapon type\""
+msgstr ""
+
 msgid "\"Emote shortcut 12\""
 msgstr ""
 
@@ -962,6 +1074,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr "Aber du kannst dich vor solchen Spielern schützen, indem du sie ignorierst. Rechts-⏎ klicke auf sie, um das Kontextmenü aufzurufen, dann wähle `Ignore' oder⏎ `Disregard' (siehe unten). In deinem ⏎  Einstellungs-Menü kannst du Feineinstellungen deiner 'Beziehungen' vornehmen. Um dieses ⏎ Menü zu öffnen, klicke in der oberen rechten Ecke auf 'Einstellungen', dann auf den Tab 'Beziehungen'. Dieser listet alle Spieler auf, die du hinzugefügt hast."
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr "Verschiedene Patches"
 
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index 82da8a6bb..38bddb33e 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,14 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
-msgstr "\"Atajo para vestimenta 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
+msgstr "\"Alternar ataque pvp\""
 
 msgid "To read about whispering and other chat commands, look here:"
 msgstr "Para leer acerca de los comandos de susurros y otros, ve aquí:"
@@ -39,11 +42,8 @@ msgstr "Puedes seleccionar otros temas.\nPara esto, debes abrir las configuracio
 msgid "\"Target & attack\""
 msgstr "\"Seleccionar y Atacar\""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr "La mayoría de los comandos funcionan en los susurros.\nPor ejemplo, escribir el comando /imitation en la pestaña de susurro de nick1\n es similar al escribir comando /imitation nick1."
+msgid "/atkhuman - select and attack nearest player."
+msgstr ""
 
 msgid "\"Emote shortcut 11\""
 msgstr "\"Atajo para emoticono 11\""
@@ -56,19 +56,20 @@ msgid ""
 " window and drop them."
 msgstr " Para añadir un objeto a la barra de atajos clickea en la ventana del inventario\n sobre el artículo, luego dale click en la casilla de de la ventana Atajos donde\n quieras asociar el elemento. Para reordenar los elementos dentro de la ventana de\n atajos simplemente muévalo entre las casillas. Para removerlos, simplemente\n arrástralos fuera de la ventana de atajos."
 
-msgid "\"Ignore input 1\""
-msgstr "\"Ignorar input 1\""
+msgid "\"Outfit shortcut 12\""
+msgstr "\"Atajo para vestimenta 12\""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - muestra un texto con información de la caché."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr "\"Ventana de Vestimentas\""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Puedes imitar a otros jugadores seleccionando \"imitar\" en el menú contextual\n de un jugador o escribiendo el siguiente comando en el chat: /imitate nick."
+msgid "KEYBOARD:"
+msgstr "TECLADO:"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -84,6 +85,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr "\"Voltear hacia abajo\""
 
+msgid "GM"
+msgstr ""
+
 msgid "\"Target NPC\""
 msgstr "\"Seleccionar NPC\""
 
@@ -99,8 +103,8 @@ msgid ""
 "then click on warp what you want."
 msgstr "Puedes caminar hacia los portales de forma automática. Abre la Ventana Social (###keyWindowSocial;)  y selecciona la pestaña Navegación, luego sale clic al portal que quieras."
 
-msgid "\"Chat window\""
-msgstr "\"Ventana de Chat\""
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - agregar nick a la lista de relación neutral."
@@ -114,8 +118,8 @@ msgstr "/addpriorityattack NOMBRE - agregar monstruo a la lista de ataque priori
 msgid "Back to Index"
 msgstr "Volver al Índice"
 
-msgid "DOWNLOADS"
-msgstr "DESCARGAS"
+msgid "\"Quit\""
+msgstr "\"Salir\""
 
 msgid "THE PLAYER LIST"
 msgstr "LA LISTA DE JUGADOR"
@@ -123,22 +127,43 @@ msgstr "LA LISTA DE JUGADOR"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - cargar precios de la tienda desde disco."
 
+msgid "Search string not found."
+msgstr "Cadena de busqueda no encontrada."
+
 msgid "\"Quests window\""
 msgstr "\"Ventana de Misiones\""
 
+msgid "Other contributors"
+msgstr "Otros contribuyentes"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr "Puedes deshabilitar la barra amarilla, presionando ###keyDisableGameModifiers;."
 
+msgid "\"Next chat tab\""
+msgstr "\"Siguiente pestaña de chat\""
+
+msgid "Support"
+msgstr "Apoyo"
+
 msgid "\"Quick drop window\""
 msgstr "\"Ventana de Quick drop\""
 
 msgid "\"Screenshot\""
 msgstr "\"Captura de Pantalla\""
 
-msgid "Support"
-msgstr "Apoyo"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "La mayoría de los comandos funcionan en los susurros.\nPor ejemplo, escribir el comando /imitation en la pestaña de susurro de nick1\n es similar al escribir comando /imitation nick1."
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "La comunicación es esecial muchas veces para triunfar en este juego. Puedes\n comunicarte de muchas maneras: Chateando y mostrando emociones (ver arriba),\n realizando intercambios (desde el menú contextual al darle clic derecho),\n y a través de los susurros."
 
 msgid "\"Emote shortcut 1\""
 msgstr "\"Atajo para emoticono 1\""
@@ -151,6 +176,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr "\"Atajo para vestimenta 13\""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -159,17 +187,23 @@ msgstr " Puedes mejorar tus habilidades incrementando el nivel de trabajo. Cada
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me texto - envía un texto al chat tal como el comando /me en el irc."
 
+msgid "\"Chat window\""
+msgstr "\"Ventana de Chat\""
+
 msgid "\"Emote shortcut 10\""
 msgstr "\"Atajo para emoticono 10\""
 
 msgid "\"Item shortcut 14\""
 msgstr "\"Atajo para objeto 14\"  "
 
+msgid "\"Ignore input 1\""
+msgstr "\"Ignorar input 1\""
+
 msgid "Mana Contributors"
 msgstr "Mana: Contribuyentes"
 
-msgid "\"Change map view mode\""
-msgstr "\"Cambiar modo de vista del mapa\""
+msgid "Content devs"
+msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
 msgstr "/query NICK, /q NICK - abrir nueva pestaña de susurro para el nick indicado."
@@ -191,6 +225,12 @@ msgstr "\"Atajo para emoticono 7\""
 msgid "Debug"
 msgstr "Depurador"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr "Sitio web: @@http://manaplus.org/|http://manaplus.org/@@"
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NOMBRE - agregar monstruo a la lista de ataque."
 
@@ -216,8 +256,8 @@ msgstr "\"Atajo para vestimenta 6\""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - establecer el contador de caída de objetos al valor pedido."
 
-msgid "\"Quit\""
-msgstr "\"Salir\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr ""
 
 msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - ponerse el vestimenta número N."
@@ -237,8 +277,8 @@ msgstr "\"Bajar\""
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - cura a NICK."
 
-msgid "Contributors to client development"
-msgstr "Contribuyentes al desarrollo del cliente"
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr "\"Ventana de Configuración\""
@@ -249,8 +289,8 @@ msgstr "/removeattack NOMBRE - remover monstruo de la lista de ataque."
 msgid "\"Set direction up\""
 msgstr "\"Voltear hacia arriba\""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - muestra en el chat la posición actual del jugador."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr "Instrucciones"
@@ -260,18 +300,19 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr "Si el cliente está funcionando muy lento, puedes mejorar la velocidad aplicando \n los siguientes consejos: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 
-msgid "/exp - show party experience sharing options."
-msgstr ""
+msgid "\"Kills stats window\""
+msgstr "\"Ventana de estadisticas de matanzas\""
 
 msgid ""
 "You can do basic searching in help by using command\n"
 "##2?text"
 msgstr "Puedes hacer búsquedas básicas en la ayuda usando el comando\n##2?text"
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Puedes comprar o vender artículos en las tiendas de los jugadores.\nHaz clic derecho sobre el jugador y selecciona \"Comprar\" o \"Vender\""
+msgid "\"Change move to target type\""
+msgstr "\"Cambiar tipo de movimiento al objetivo\""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr "\"Habilitar/Deshabilitar Intercambios\""
@@ -291,8 +332,8 @@ msgstr " Si estás teniendo problemas, por favor, primero que nada, lee el FAQ.
 msgid "IGNORING COMMUNICATION"
 msgstr "IGNORANDO COMUNICACIÓN"
 
-msgid "WINDOWS"
-msgstr "VENTANAS"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "SOPORTE"
@@ -337,6 +378,15 @@ msgstr "Puedes restaurar las configuraciones de la barra amarilla, haciendo clic
 msgid "/who - print online players number to chat."
 msgstr "/who - mostrar en el chat el número de jugadores conectados."
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway MSG - fijar/desfijar modo pseudo away."
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - mostrar el tiempo de actividad del cliente."
 
@@ -361,8 +411,10 @@ msgstr "/imitation NICK - iniciar modo de imitación."
 msgid "\"Outfit shortcut 5\""
 msgstr "\"Atajo para vestimenta 5\""
 
-msgid "KEYBOARD:"
-msgstr "TECLADO:"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Puedes imitar a otros jugadores seleccionando \"imitar\" en el menú contextual\n de un jugador o escribiendo el siguiente comando en el chat: /imitate nick."
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -374,12 +426,15 @@ msgstr "\"Desplazar el chat hacia abajo\""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr "Noticias del servidor"
+msgid "Contributors to client development"
+msgstr "Contribuyentes al desarrollo del cliente"
 
 msgid "\"Outfit shortcut 11\""
 msgstr "\"Atajo para vestimenta 11\""
 
+msgid "\"Move right\""
+msgstr "\"Derecha\""
+
 msgid "\"Item shortcut 11\""
 msgstr "\"Atajo para objeto 11\"  "
 
@@ -403,8 +458,11 @@ msgstr "Puedes leer acerca de la barra amarilla aquí:\n@@http://manaplus.org/ye
 msgid "\"Move to target\""
 msgstr "\"Mover hacia el objetivo\""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway MSG - fijar/desfijar modo pseudo away."
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr "\"Habilitar / deshabilitar modo AFK (lejos del teclado)\""
@@ -427,8 +485,8 @@ msgstr "/ignoreall - agregar todos los susurros a la lista de ignorados."
 msgid "\"Copy outfit\""
 msgstr "\"Copiar vestimenta\""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Sitio web: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Server news"
+msgstr "Noticias del servidor"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NICK - agregar a NICK a la lista de ignorados."
@@ -439,14 +497,11 @@ msgstr "\"Tecla de atajos para objetos\""
 msgid "\"Disable / enable game modifier keys\""
 msgstr "\"Habilitar/Deshabilitar teclas modificadoras del juego\""
 
-msgid "Other contributors"
-msgstr "Otros contribuyentes"
+msgid "\"Change crazy Move mode\""
+msgstr "\"Cambiar modo de Movimientos alocados\""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "La comunicación es esecial muchas veces para triunfar en este juego. Puedes\n comunicarte de muchas maneras: Chateando y mostrando emociones (ver arriba),\n realizando intercambios (desde el menú contextual al darle clic derecho),\n y a través de los susurros."
+msgid "/where - print current player position to chat."
+msgstr "/where - muestra en el chat la posición actual del jugador."
 
 msgid "\"Attack\""
 msgstr "\"Atacar\""
@@ -454,8 +509,8 @@ msgstr "\"Atacar\""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - ponerse la siguiente vestimenta."
 
-msgid "\"Move right\""
-msgstr "\"Derecha\""
+msgid "/magicattack - attack target with magic."
+msgstr ""
 
 msgid ""
 "You can set away mode,\n"
@@ -483,8 +538,8 @@ msgstr "/addignoreattack NOMBRE - agregar monstruo a la lista de ignorar ataque.
 msgid "Android porting"
 msgstr "Portabilidad Android"
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - limpiar la pestaña del chat activa."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr "\"Ventana Social\""
@@ -507,6 +562,9 @@ msgstr "Intercambio"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist NICK - agregar nick a la lista negra."
 
+msgid "\"Change map view mode\""
+msgstr "\"Cambiar modo de vista del mapa\""
+
 msgid "\"Close chat tab\""
 msgstr "\"Cerrar pestaña del chat\""
 
@@ -522,6 +580,9 @@ msgstr ""
 msgid "Download"
 msgstr "Descarga"
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -533,13 +594,16 @@ msgstr "Contribuyentes en arte o imágenes"
 msgid "\"Target player\""
 msgstr "\"Seleccionar jugador\""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr "##2ManaPlus versión: ##6%VER%"
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -551,12 +615,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr "\"Ventana de depurador\""
 
-msgid "\"Next chat tab\""
-msgstr "\"Siguiente pestaña de chat\""
+msgid "/uploadlog - upload log into pastebin service."
+msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "ManaPlus: Contribuyentes"
 
+msgid "\"Emote shortcut 5\""
+msgstr "\"Atajo para emoticono 5\""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr "\"Copiar lo equipado a Vestimenta\""
 
@@ -566,8 +633,10 @@ msgstr "Habilidades básicas:"
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr "\"Cambiar tipo de movimiento al objetivo\""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Puedes comprar o vender artículos en las tiendas de los jugadores.\nHaz clic derecho sobre el jugador y selecciona \"Comprar\" o \"Vender\""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase NICK - agregar nick a la lista de borrados."
@@ -594,6 +663,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr "##2               SDL, SDL_image, SDL_mixer (Media framework)\n##2                     SDL_net (Networking framework)\n##2                        Guichan (GUI framework)\n##2                   libxml2 (XML parsing and writing)\n##2                          PhysFS (Data files)\n##2                        libcurl (HTTP downloads)\n##2                            zlib (Archives)"
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend NICK, /befriend NICK - agregar nick a la lista de amigos."
 
@@ -649,15 +722,21 @@ msgid ""
 "nick."
 msgstr "/msg NICK texto, /whisper NICK texto, /w NICK texto - envía un susurro a NICK."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr "\"Atajo para emoticono 14\""
 
-msgid "\"Item shortcut 1\""
-msgstr "\"Atajo para objeto 1\""
+msgid "/open URL - open url in browser."
+msgstr ""
 
 msgid "Commands"
 msgstr "Comandos"
 
+msgid "WINDOWS"
+msgstr "VENTANAS"
+
 msgid "\"Outfit shortcut 9\""
 msgstr "\"Atajo para vestimenta 9\""
 
@@ -672,8 +751,11 @@ msgid ""
 " of the following:"
 msgstr " La lista de jugadores muestra la lista de todos los jugadores que conozcas. Ellos\n están categorizados como sigue:"
 
-msgid "\"Change attack weapon type\""
-msgstr "\"Cambiar tipo de arma de ataque\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
 msgstr "/outfit prev - ponerse la vestimenta previa."
@@ -681,6 +763,9 @@ msgstr "/outfit prev - ponerse la vestimenta previa."
 msgid "\"Crazy moves\""
 msgstr "\"Movimientos locos\""
 
+msgid "Powered By"
+msgstr "Impulsado Por"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -702,8 +787,8 @@ msgstr "\"Línea del chat siguiente\""
 msgid "\"Set direction right\""
 msgstr "\"Voltear a la derecha\""
 
-msgid "\"Move to home location\""
-msgstr "\"Mover a la posición home\""
+msgid "/announce MESSAGE - show global message."
+msgstr ""
 
 msgid "Player relations"
 msgstr "Relaciones del jugador"
@@ -737,17 +822,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr "\"Ventana de habilidades\""
 
-msgid "\"Kills stats window\""
-msgstr "\"Ventana de estadisticas de matanzas\""
+msgid "\"Move to home location\""
+msgstr "\"Mover a la posición home\""
 
 msgid "\"Toggle chat\""
 msgstr "\"Activar chat\""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr "\"Cambiar tipo de ataque\""
 
-msgid "Manaplus Developers"
-msgstr "ManaPlus: Desarrolladores"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - limpiar la pestaña del chat activa."
 
 msgid "\"On / off audio\""
 msgstr "\"Encender / Apagar audio\""
@@ -764,8 +852,8 @@ msgstr "Puedes cambiar cualquier tecla en las configuraciones del teclado."
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - mostrar en la pestaña del depurador los directorios del cliente."
 
-msgid "Powered By"
-msgstr "Impulsado Por"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - desconectarse rápidamente del servidor."
@@ -782,12 +870,15 @@ msgstr "\"Atajo para emoticono 13\""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/disregard NICK - agregar nick a la lista de desatendidos."
 
-msgid "\"Change crazy Move mode\""
-msgstr "\"Cambiar modo de Movimientos alocados\""
+msgid "\"Item shortcut 1\""
+msgstr "\"Atajo para objeto 1\""
 
 msgid "\"Outfit shortcut 8\""
 msgstr "\"Atajo para vestimenta 8\""
 
+msgid "Manaplus Developers"
+msgstr "ManaPlus: Desarrolladores"
+
 msgid "\"Change imitation mode\""
 msgstr "\"Cambiar modo de imitación\""
 
@@ -799,12 +890,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr "\"Reestablecer modo de video a valor seguro\""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress NICK - quitar toda la ropa de un nick (efecto local sólamente)."
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -813,11 +910,14 @@ msgstr " Por otro lado, visita la sección @@team|Equipo de Desarrollo@@ para te
 msgid "\"Outfit shortcut 14\""
 msgstr "\"Atajo para vestimenta 14\""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr "\"Dejar caer rápidamente N artículos del la ranura 0\""
 
-msgid "\"Switch pvp attack\""
-msgstr "\"Alternar ataque pvp\""
+msgid "/enablehighlight - enable highlight in current tab."
+msgstr ""
 
 msgid "\"Emote shortcut window\""
 msgstr "\"Ventana para Emoticonos\""
@@ -825,18 +925,27 @@ msgstr "\"Ventana para Emoticonos\""
 msgid "\"Bot checker window\""
 msgstr "\"Ventana de chequeo de bot\""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr "/mail NICK MSJ - envía un mensaje offline a NICK. Sólo funciona en el servidor de tmw."
 
+msgid "DOWNLOADS"
+msgstr "DESCARGAS"
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr "\"Atajo para objeto 15\"  "
 
 msgid "About The Mana World"
 msgstr "Acerca de The Mana World"
 
-msgid "\"Emote shortcut 5\""
-msgstr "\"Atajo para emoticono 5\""
+msgid "/testparticle FILENAME - set test particle on player."
+msgstr ""
 
 msgid "\"Smilie\""
 msgstr "\"Sonrreír\""
@@ -860,8 +969,8 @@ msgstr "Puedes ver lo que llevan equipado los demás jugadores haciendo clic der
 msgid "Whispers"
 msgstr "Susurros"
 
-msgid "Search string not found."
-msgstr "Cadena de busqueda no encontrada."
+msgid "/url URL - insert url into chat."
+msgstr ""
 
 msgid "\"Wear outfit\""
 msgstr "\"Ponerse la vestimenta\""
@@ -904,6 +1013,9 @@ msgstr " Te darás cuenta de que no todas las comunicaciones te gustaran. Aunque
 msgid "About"
 msgstr "Acerca de..."
 
+msgid "\"Change attack weapon type\""
+msgstr "\"Cambiar tipo de arma de ataque\""
+
 msgid "\"Emote shortcut 12\""
 msgstr "\"Atajo para emoticono 12\""
 
@@ -963,6 +1075,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr " Sin embargo, tú puedes protegerte de esos jugadores ignorándolos. Haz clic\n derecho sobre ellos y, en el menú contextual, selecciona \"Ignorar\" o\n \"Desatender\" (ver abajo). Puedes ver tus relaciones con los jugadores en el\n menú \"Configuración\", donde se enlistan todos los jugadores que has añadido.\n Para abrir este menú, selecciona \"Configuración\" en esquina superior de la \n ventana del cliente y después en \"Relaciones\"."
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr "Parches diferentes"
 
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index ef6bc0a0e..f5183df7a 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -1,6 +1,6 @@
 # en#
 # Translators:
-# Alige <aligetmw@hotmail.fr>, 2013
+# Alige <aligetmw@hotmail.fr>, 2013-2014
 # Alige <aligetmw@hotmail.fr>, 2012
 # Choupom <andycootlapin@hotmail.fr>, 2012
 # Bernard <nard@bh28.net>, 2014
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-14 11:49+0000\n"
-"Last-Translator: Bernard <nard@bh28.net>\n"
+"PO-Revision-Date: 2014-03-01 06:16+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,14 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "/item 0 - disable party item sharing options."
-msgstr "/item 0 - désactiver le partage d'objets du groupe."
+msgid "/invite NICK - invite a player to your party."
+msgstr "/invite - Inviter un joueur à rejoindre votre groupe"
 
-msgid "\"Outfit shortcut 12\""
-msgstr "\"Raccourci de tenue 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
+msgstr "\"Changer en attaque JvJ\""
 
 msgid "To read about whispering and other chat commands, look here:"
 msgstr "Pour en savoir plus sur le chuchotement et les autres commandes de chat, regardez ici :"
@@ -38,11 +41,8 @@ msgstr "Vous pouvez sélectionner d'autres thèmes.\nPour ce faire, ouvrez la fe
 msgid "\"Target & attack\""
 msgstr "\"Cibler & attaquer\""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr "La plupart des commandes  fonctionnent dans les onglets de conversation privée \n(whispers). Par example la commande /imitation tapée dans l'onglet de conversation avec \n\"NOM\" a le même effet que la commande /imitation \"NOM\" ou le clic-droit sur NOM suivi \ndu choix imitation."
+msgid "/atkhuman - select and attack nearest player."
+msgstr ""
 
 msgid "\"Emote shortcut 11\""
 msgstr "\"Raccourci d'émoticône 11\""
@@ -55,19 +55,20 @@ msgid ""
 " window and drop them."
 msgstr "Pour ajouter un objet dans la barre de raccourci cliquez sur l'objet dans la fenêtre de \nl'inventaire, puis cliquez sur la boîte dans la fenêtre de raccourci qui devrait être associée \navec l'objet. Pour réorganiser des objets à l'intérieur de la fenêtre de raccourci faites-les \nglisser simplement entre les boîtes. Pour enlever des objets tu les faites les simplement \nglisser simplement en dehors de la fenêtre."
 
-msgid "\"Ignore input 1\""
-msgstr "\"Ignore entrée 1\""
+msgid "\"Outfit shortcut 12\""
+msgstr "\"Raccourci de tenue 12\""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - afficher l'info. du cache texte."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr "/exp - Désactive le partage d'expérience dans le groupe"
+
 msgid "\"Outfits window\""
 msgstr "\"Fenêtre des tenues\""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Vous pouvez imiter un autre joueur en choisissant \"imitation\" dans le menu contextuel ou en écrivant /imitate NOM"
+msgid "KEYBOARD:"
+msgstr "CLAVIER :"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -83,6 +84,9 @@ msgstr "/item 1 - activer le partage d'objets du groupe."
 msgid "\"Set direction down\""
 msgstr "\"Définir la direction vers le bas\""
 
+msgid "GM"
+msgstr "MJ"
+
 msgid "\"Target NPC\""
 msgstr "\"Cibler PNJ\""
 
@@ -98,8 +102,8 @@ msgid ""
 "then click on warp what you want."
 msgstr "Vous pouvez marcher jusqu'aux points de transport (warp points) automatiquement.\nOuvrez fa fenêtre Social (F11) et sélectionnez l'onglet Nav, puis cliquez sur le nom du point où vous voulez aller."
 
-msgid "\"Chat window\""
-msgstr "\"Fenêtre de Chat\""
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - ajouter NICK à la liste des relations neutres."
@@ -113,8 +117,8 @@ msgstr "/addpriorityattack NOM - ajouter le monstre NOM à la liste d'attaques p
 msgid "Back to Index"
 msgstr "Retour à l'Index"
 
-msgid "DOWNLOADS"
-msgstr "TÉLÉCHARGEMENTS"
+msgid "\"Quit\""
+msgstr "\"Quitter\""
 
 msgid "THE PLAYER LIST"
 msgstr "LISTE DES JOUEURS"
@@ -122,22 +126,43 @@ msgstr "LISTE DES JOUEURS"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - Charger la liste de prix-boutique depuis le disque."
 
+msgid "Search string not found."
+msgstr "Chaîne recherchée non trouvée."
+
 msgid "\"Quests window\""
 msgstr "\"Fenêtre des Quêtes\""
 
+msgid "Other contributors"
+msgstr "Autres contributeurs"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr "Vous pouvez désactiver la barre jaune,\nen appuyant sur ###keyDisableGameModifiers;."
 
+msgid "\"Next chat tab\""
+msgstr "Onglet de dialogue suivant"
+
+msgid "Support"
+msgstr "Support"
+
 msgid "\"Quick drop window\""
 msgstr "\"Fenêtre de jet rapide\""
 
 msgid "\"Screenshot\""
 msgstr "\"Capture d'écran\""
 
-msgid "Support"
-msgstr "Support"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "La plupart des commandes  fonctionnent dans les onglets de conversation privée \n(whispers). Par example la commande /imitation tapée dans l'onglet de conversation avec \n\"NOM\" a le même effet que la commande /imitation \"NOM\" ou le clic-droit sur NOM suivi \ndu choix imitation."
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "Communiquer est souvent essentiel pour réussir dans le jeu. Vous pouvez communiquer\n de plusieurs manières : En discutant (dialogue) en montrant des émoticônes (voir plus haut), en échangeant\n (avec le menu contextuel clic-droit) ou en chuchotant."
 
 msgid "\"Emote shortcut 1\""
 msgstr "\"Raccourci d'émoticône 1\""
@@ -150,6 +175,9 @@ msgstr " - ##2ignorer##9:  Vous voulez ignorer complètement ce joueur. Vous ne
 msgid "\"Outfit shortcut 13\""
 msgstr "\"Raccourci de tenue 13\""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -158,17 +186,23 @@ msgstr " Vous pouvez améliorer vos compétences en augmentant ton niveau de mé
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me TEXTE - envoyer TEXTE dans le chat comme la commande /me sur IRC."
 
+msgid "\"Chat window\""
+msgstr "\"Fenêtre de Chat\""
+
 msgid "\"Emote shortcut 10\""
 msgstr "\"Raccourci d'émoticône 10\""
 
 msgid "\"Item shortcut 14\""
 msgstr "\"Raccourci d'objet 14\""
 
+msgid "\"Ignore input 1\""
+msgstr "\"Ignore entrée 1\""
+
 msgid "Mana Contributors"
 msgstr "Contributeurs de Mana"
 
-msgid "\"Change map view mode\""
-msgstr "\"Changer le mode de vue de carte\""
+msgid "Content devs"
+msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
 msgstr "/query PSEUDO, /q PSEUDO - ouvre un nouvel onglet de discussion avec le joueur \"PSEUDO\"."
@@ -190,6 +224,12 @@ msgstr "\"Raccourci d'émoticône 7\""
 msgid "Debug"
 msgstr "Débogage"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr "Site Web : @@http://manaplus.org/|http://manaplus.org/@@"
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NOM - ajoute le monstre NOM à la liste d'attaque."
 
@@ -215,8 +255,8 @@ msgstr "\"Raccourci de tenue 6\""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - choisit le nombre d'objets à jeter par la touche de jet rapide."
 
-msgid "\"Quit\""
-msgstr "\"Quitter\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr ""
 
 msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - met la tenue numéro N."
@@ -236,8 +276,8 @@ msgstr "\"Aller vers le bas\""
 msgid "/heal NICK - heal nick."
 msgstr "/heal PSEUDO - soigner le joueur \"PSEUDO\"."
 
-msgid "Contributors to client development"
-msgstr "Contributeurs au développement du client"
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr "\"Fenêtre des réglages\""
@@ -248,8 +288,8 @@ msgstr "/removeattack NOM - Enlève le monstre NOM de la liste d'attaque."
 msgid "\"Set direction up\""
 msgstr "\"Définir la direction vers le haut\""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - affiche la position actuelle du joueur dans le chat."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr "Instructions"
@@ -259,18 +299,19 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr "Si le client fonctionne très lentement, vous pouvez améliorer sa vitesse\nen lisant ceci : @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 
-msgid "/exp - show party experience sharing options."
-msgstr "/exp - Affiche / Modifie les préférences de partage d'expérience du groupe"
+msgid "\"Kills stats window\""
+msgstr "\"Fenêtre des statistiques de combat\""
 
 msgid ""
 "You can do basic searching in help by using command\n"
 "##2?text"
 msgstr "Vous pouvez faire une recherche simple dans l'aide en utilisant la commande: \n##2?text"
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Vous pouvez acheter ou vendre des objets aux boutiques des joueurs.\nFaites un clic-droit sur le joueur et choisissez \"Acheter\" ou \"Vendre\""
+msgid "\"Change move to target type\""
+msgstr "Changer le type de déplacement vers les cibles"
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr "\"Activer / Désactiver les échanges\""
@@ -290,8 +331,8 @@ msgstr "Si vous rencontrez des problèmes, veuillez d'abord lire la FAQ.\nSi vou
 msgid "IGNORING COMMUNICATION"
 msgstr "IGNORER LES COMMUNICATIONS"
 
-msgid "WINDOWS"
-msgstr "FENETRES"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "SUPPORT"
@@ -336,6 +377,15 @@ msgstr "Vous pouvez réinitialiser la barre jaune,\nen faisant un clic-droit des
 msgid "/who - print online players number to chat."
 msgstr "/who - affiche le nombre de joueurs en ligne dans le chat."
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway MSG - active/désactive le mode pseudo away (pseudo-absent)."
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - affiche la durée d'utilisation du client."
 
@@ -360,8 +410,10 @@ msgstr "/imitation NOM - Démarre le mode imitation du personnage \"NOM\"."
 msgid "\"Outfit shortcut 5\""
 msgstr "\"Raccourci de tenue 5\""
 
-msgid "KEYBOARD:"
-msgstr "CLAVIER :"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Vous pouvez imiter un autre joueur en choisissant \"imitation\" dans le menu contextuel ou en écrivant /imitate NOM"
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -373,12 +425,15 @@ msgstr "\"Balayer le chat vers le bas\""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr "##2Trade:##9 active la possibilité d'échanger avec les autres."
 
-msgid "Server news"
-msgstr "Nouvelles du serveur"
+msgid "Contributors to client development"
+msgstr "Contributeurs au développement du client"
 
 msgid "\"Outfit shortcut 11\""
 msgstr "\"Raccourci de tenue 11\""
 
+msgid "\"Move right\""
+msgstr "\"Aller vers la droite\""
+
 msgid "\"Item shortcut 11\""
 msgstr "\"Raccourci d'objet 11\""
 
@@ -402,8 +457,11 @@ msgstr "À propos de la barre jaune, vous pouvez lire cette page :\n@@http://man
 msgid "\"Move to target\""
 msgstr "\"Aller à la cible\""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway MSG - active/désactive le mode pseudo away (pseudo-absent)."
+msgid "/item 0 - disable party item sharing options."
+msgstr "/item 0 - désactiver le partage d'objets du groupe."
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr "\"Activer/Désactiver le mode Inactif\""
@@ -426,8 +484,8 @@ msgstr "/ignoreall - ajoute tous les joueurs à la liste d'ignorés."
 msgid "\"Copy outfit\""
 msgstr "\"Copier la tenue\""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Site Web : @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Server news"
+msgstr "Nouvelles du serveur"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NOM - ajoute \"NOM\" à la liste d'ignorés."
@@ -438,14 +496,11 @@ msgstr "\"Touche des raccourcis d'objets\""
 msgid "\"Disable / enable game modifier keys\""
 msgstr "\"Activer / Désactiver les touches de modification de jeu\""
 
-msgid "Other contributors"
-msgstr "Autres contributeurs"
+msgid "\"Change crazy Move mode\""
+msgstr "\"Changer le mode des mouvements fous\""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "Communiquer est souvent essentiel pour réussir dans le jeu. Vous pouvez communiquer\n de plusieurs manières : En discutant (dialogue) en montrant des émoticônes (voir plus haut), en échangeant\n (avec le menu contextuel clic-droit) ou en chuchotant."
+msgid "/where - print current player position to chat."
+msgstr "/where - affiche la position actuelle du joueur dans le chat."
 
 msgid "\"Attack\""
 msgstr "\"Attaquer\""
@@ -453,8 +508,8 @@ msgstr "\"Attaquer\""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - met la tenue suivante."
 
-msgid "\"Move right\""
-msgstr "\"Aller vers la droite\""
+msgid "/magicattack - attack target with magic."
+msgstr ""
 
 msgid ""
 "You can set away mode,\n"
@@ -482,8 +537,8 @@ msgstr "/addignoreattack NOM - ajoute le monstre NOM à la liste d'ignorés."
 msgid "Android porting"
 msgstr "Portage Android"
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - efface l'onglet de conversation courant."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr "\"Fenêtre sociale\""
@@ -506,6 +561,9 @@ msgstr "Échanger"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist NOM - ajoute \"NOM\" a la liste noire de relations."
 
+msgid "\"Change map view mode\""
+msgstr "\"Changer le mode de vue de carte\""
+
 msgid "\"Close chat tab\""
 msgstr "\"Fermer le tab de chat\""
 
@@ -521,6 +579,9 @@ msgstr " - ##2neutral##P:  Dans la mesure ou le jeu est concerné, ceci est iden
 msgid "Download"
 msgstr "Téléchargement"
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -532,14 +593,17 @@ msgstr " Contributeurs: artistes graphiques"
 msgid "\"Target player\""
 msgstr "Viser le Joueur"
 
-msgid "/invite NICK - invite a player to your party."
-msgstr "/invite - Inviter un joueur à rejoindre votre groupe"
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
+msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr "##2Version de ManaPlus : ##6%VER%"
 
-msgid "/exp 0 - disable party experience sharing options."
-msgstr "/exp - Désactive le partage d'expérience dans le groupe"
+msgid "/enemy NICK - add nick to enemyes list."
+msgstr ""
 
 msgid ""
 " - ##2disregarded##9:  You wish to disregard this player, meaning that his or\n"
@@ -550,12 +614,15 @@ msgstr " - ##2disregarded##9:  Vous voulez négliger ce joueur, ce qui signifie
 msgid "\"Debug window\""
 msgstr "\"Fenêtre de débogage\""
 
-msgid "\"Next chat tab\""
-msgstr "Onglet de dialogue suivant"
+msgid "/uploadlog - upload log into pastebin service."
+msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "Contributeurs à ManaPlus"
 
+msgid "\"Emote shortcut 5\""
+msgstr "\"Raccourci d'émoticône 5\""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr "Copier l'équipement porté dans les tenues"
 
@@ -565,8 +632,10 @@ msgstr "Compétences de base :"
 msgid "/leave - leave the party you are in."
 msgstr "/leave > Quitte le groupe dont vous êtes membre."
 
-msgid "\"Change move to target type\""
-msgstr "Changer le type de déplacement vers les cibles"
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Vous pouvez acheter ou vendre des objets aux boutiques des joueurs.\nFaites un clic-droit sur le joueur et choisissez \"Acheter\" ou \"Vendre\""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase NOM - ajoute NOM à la liste de joueurs effacés."
@@ -593,6 +662,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr "##2  SDL, SDL_image, SDL_mixer (Media framework)\n##2  SDL_net (Networking framework)\n##2  Guichan (GUI framework)\n##2  libxml2 (XML parsing and writing)\n##2  PhysFS (Data files)\n##2  libcurl (HTTP downloads)\n##2  zlib (Archives)"
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend PSEUDO, /befriend PSEUDO - ajoute le joueur à la liste des amis."
 
@@ -648,15 +721,21 @@ msgid ""
 "nick."
 msgstr "/msg PSEUDO texte, /whisper PSEUDO texte, /w PSEUDO texte - envoie un message privé au joueur."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr "\"Raccourci d'émoticône 14\""
 
-msgid "\"Item shortcut 1\""
-msgstr "\"Raccourci d'objet 1\""
+msgid "/open URL - open url in browser."
+msgstr ""
 
 msgid "Commands"
 msgstr "Commandes"
 
+msgid "WINDOWS"
+msgstr "FENETRES"
+
 msgid "\"Outfit shortcut 9\""
 msgstr "\"Raccourci de tenue 9\""
 
@@ -671,8 +750,11 @@ msgid ""
 " of the following:"
 msgstr " La liste de toutes tes relations avec les joueurs.  Elles sont classées dans\nl'une des catégories suivantes :"
 
-msgid "\"Change attack weapon type\""
-msgstr "Changer de type d'arme d'attaque"
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
 msgstr "/outfit prev - met la tenue précédente."
@@ -680,6 +762,9 @@ msgstr "/outfit prev - met la tenue précédente."
 msgid "\"Crazy moves\""
 msgstr "\"Mouvements fous\""
 
+msgid "Powered By"
+msgstr "Motorisé par"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr "##2Groupe level2:##P Permet à un personnage de créer un groupe."
 
@@ -701,8 +786,8 @@ msgstr "\"Prochaine ligne de l'onglet de chat\""
 msgid "\"Set direction right\""
 msgstr "\"Définir la direction vers la droite\""
 
-msgid "\"Move to home location\""
-msgstr "\"Aller à la position  de base\""
+msgid "/announce MESSAGE - show global message."
+msgstr ""
 
 msgid "Player relations"
 msgstr "Relations joueurs"
@@ -736,17 +821,20 @@ msgstr "##9Les compétences magiques peuvent être obtenues en accomplissant des
 msgid "\"Skill window\""
 msgstr "\"Fenêtre des compétences\""
 
-msgid "\"Kills stats window\""
-msgstr "\"Fenêtre des statistiques de combat\""
+msgid "\"Move to home location\""
+msgstr "\"Aller à la position  de base\""
 
 msgid "\"Toggle chat\""
 msgstr "\"Activer / Désactiver l'entrée dans le chat\""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr "\"Changer le type d'attaque\""
 
-msgid "Manaplus Developers"
-msgstr "Développeurs de Manaplus"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - efface l'onglet de conversation courant."
 
 msgid "\"On / off audio\""
 msgstr "\"Audio On / Off\""
@@ -763,8 +851,8 @@ msgstr "Tu peux changer n'importe quelle touche dans la configuration du clavier
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - Liste les répertoires utilisés par le client dans l'onglet d'informations de débogage."
 
-msgid "Powered By"
-msgstr "Motorisé par"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - déconnexion rapide du serveur."
@@ -781,12 +869,15 @@ msgstr "\"Raccourci d'émoticône 13\""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/disregard NOM - ajouter NOM à la liste de négligés."
 
-msgid "\"Change crazy Move mode\""
-msgstr "\"Changer le mode des mouvements fous\""
+msgid "\"Item shortcut 1\""
+msgstr "\"Raccourci d'objet 1\""
 
 msgid "\"Outfit shortcut 8\""
 msgstr "\"Raccourci de tenue 8\""
 
+msgid "Manaplus Developers"
+msgstr "Développeurs de Manaplus"
+
 msgid "\"Change imitation mode\""
 msgstr "\"Changer le mode d'imitation\""
 
@@ -798,12 +889,18 @@ msgstr "##2ManaPlus##9 is un client étendu basé sur le  code du client  ##2Man
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr "##9D'autres compétences peuvent êtres obtenues en accomplissant des quêtes et des missions dans le jeu."
 
+msgid "/exp - show party experience sharing options."
+msgstr "/exp - Affiche / Modifie les préférences de partage d'expérience du groupe"
+
 msgid "\"Reset video mode to safe value\""
 msgstr "\"Reinitialiser le mode de vidéo\" "
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress NOM - Déshabiller complètement NOM. Effet local seulement."
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -812,11 +909,14 @@ msgstr "Sinon regardez la section @@team|Équipe de Développement@@ pour avoir
 msgid "\"Outfit shortcut 14\""
 msgstr "\"Raccourci de tenue 14\""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr "\"Jeter rapidement N objets depuis le case 0\""
 
-msgid "\"Switch pvp attack\""
-msgstr "\"Changer en attaque JvJ\""
+msgid "/enablehighlight - enable highlight in current tab."
+msgstr ""
 
 msgid "\"Emote shortcut window\""
 msgstr "\"Fenêtre des raccourcis d'émoticônes\""
@@ -824,18 +924,27 @@ msgstr "\"Fenêtre des raccourcis d'émoticônes\""
 msgid "\"Bot checker window\""
 msgstr "\"Fenêtre de vérifications de bots\""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr "/mail NOM MSG - Envoyer un message a \"NOM\" alors qu'il est hors ligne. Fonctionne uniquement  sur le serveur tmw avec \"AuctionBot\"."
 
+msgid "DOWNLOADS"
+msgstr "TÉLÉCHARGEMENTS"
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr "\"Raccourci d'objet 15\""
 
 msgid "About The Mana World"
 msgstr "À propos de The Mana World"
 
-msgid "\"Emote shortcut 5\""
-msgstr "\"Raccourci d'émoticône 5\""
+msgid "/testparticle FILENAME - set test particle on player."
+msgstr ""
 
 msgid "\"Smilie\""
 msgstr "\"Smiley\""
@@ -859,8 +968,8 @@ msgstr "Pour voir les objets équipés par un joueur,\nfais un clique-droit sur
 msgid "Whispers"
 msgstr "Chuchotement-message personnel"
 
-msgid "Search string not found."
-msgstr "Chaîne recherchée non trouvée."
+msgid "/url URL - insert url into chat."
+msgstr ""
 
 msgid "\"Wear outfit\""
 msgstr "\"Mettre la tenue\""
@@ -903,6 +1012,9 @@ msgstr "Il se peut que toutes les communications ne vous conviennent pas.  Même
 msgid "About"
 msgstr "A propos"
 
+msgid "\"Change attack weapon type\""
+msgstr "Changer de type d'arme d'attaque"
+
 msgid "\"Emote shortcut 12\""
 msgstr "\"Raccourci d'émoticône 12\""
 
@@ -962,6 +1074,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr " Pourtant, vous pouver vous protéger de tels joueurs en les ignorant.  Faites un clic-droit \nsur eux pour dérouler le menu contextuel, puis choisissez \"ignore\" ou \"négliger\" (voir plus \nbas).  vous pourrez affiner vos choix de relations dans le menu \"configuration\", onglet \n\"relations\", qui liste tous les joueurs que vous y avez ajouté.  Pour l'ouvrir pressez le \nbouton \"CFG\" du coin haut -droit de votre écran, puis l'onglet \"Relations\"."
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr "autres Patchs:"
 
diff --git a/data/translations/help/it.po b/data/translations/help/it.po
index fe981782c..81f6f91a3 100644
--- a/data/translations/help/it.po
+++ b/data/translations/help/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -15,10 +15,13 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
 msgstr ""
 
 msgid "To read about whispering and other chat commands, look here:"
@@ -36,10 +39,7 @@ msgstr ""
 msgid "\"Target & attack\""
 msgstr ""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
+msgid "/atkhuman - select and attack nearest player."
 msgstr ""
 
 msgid "\"Emote shortcut 11\""
@@ -53,19 +53,20 @@ msgid ""
 " window and drop them."
 msgstr " Per aggiungere un oggetto ad una Barra Veloce clicca su di esso nella finestra dell'Inventario,\n poi clicca sullo slot della finestra delle Scorciatoie.\nPer riordinare gli oggetti della Barra Veloce clicca e tieni premuto\nl'oggetto durante lo spostamento. Per rimuovere gli oggetti spostarli semplicemente fuori dalla\nfinestra."
 
-msgid "\"Ignore input 1\""
+msgid "\"Outfit shortcut 12\""
 msgstr ""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - mostra informazioni sulla cache testuale."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr ""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Puoi imitare altri giocatori selezionando la voce \"Imitazione\" dal menu contestuale del personaggio oppure digitando in chat il comando: /imitate playername."
+msgid "KEYBOARD:"
+msgstr "TASTIERA:"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -81,6 +82,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr ""
 
+msgid "GM"
+msgstr ""
+
 msgid "\"Target NPC\""
 msgstr ""
 
@@ -96,7 +100,7 @@ msgid ""
 "then click on warp what you want."
 msgstr ""
 
-msgid "\"Chat window\""
+msgid "/info - show guild info. Only for native guilds only."
 msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
@@ -111,7 +115,7 @@ msgstr "/addpriorityattack NAME - aggiungi nemico alla lista Attacco (Priorità)
 msgid "Back to Index"
 msgstr "Torna all'Indice"
 
-msgid "DOWNLOADS"
+msgid "\"Quit\""
 msgstr ""
 
 msgid "THE PLAYER LIST"
@@ -120,22 +124,43 @@ msgstr "LISTA GIOCATORI"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - carica prezzo di vendita dal disco."
 
+msgid "Search string not found."
+msgstr "La voce cercata non è stata trovata."
+
 msgid "\"Quests window\""
 msgstr ""
 
+msgid "Other contributors"
+msgstr "Altri Collaboratori"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr ""
 
+msgid "\"Next chat tab\""
+msgstr ""
+
+msgid "Support"
+msgstr "Supporto"
+
 msgid "\"Quick drop window\""
 msgstr ""
 
 msgid "\"Screenshot\""
 msgstr ""
 
-msgid "Support"
-msgstr "Supporto"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr ""
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "La Comunicazione è spesso un fattore essenziale per aver successo in questo gioco. Puoi comunicare in diverse maniere:  Chattando e mostrando Emotes (vedere sopra), commerciando\n (click destro sul destinatario), e coi Whispers."
 
 msgid "\"Emote shortcut 1\""
 msgstr ""
@@ -148,6 +173,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr ""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -156,16 +184,22 @@ msgstr " Puoi migliorare le tue Abilità aumentando il Livello Abilità. Ogni Li
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me text - manda un messaggio via chat simile al comando /me delle chat IRC."
 
+msgid "\"Chat window\""
+msgstr ""
+
 msgid "\"Emote shortcut 10\""
 msgstr ""
 
 msgid "\"Item shortcut 14\""
 msgstr ""
 
+msgid "\"Ignore input 1\""
+msgstr ""
+
 msgid "Mana Contributors"
 msgstr "Collaboratori Mana"
 
-msgid "\"Change map view mode\""
+msgid "Content devs"
 msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
@@ -188,6 +222,12 @@ msgstr ""
 msgid "Debug"
 msgstr "Debug"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr ""
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NAME - aggiungi nemico alla lista Attacco."
 
@@ -213,7 +253,7 @@ msgstr ""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr ""
 
-msgid "\"Quit\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
 msgstr ""
 
 msgid "/outfit N - wear outfit number N."
@@ -234,8 +274,8 @@ msgstr ""
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - cura personaggio."
 
-msgid "Contributors to client development"
-msgstr "Collaboratori Client"
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr ""
@@ -246,8 +286,8 @@ msgstr "/removeattack NAME - rimuovi nemico dalla lista Attacco"
 msgid "\"Set direction up\""
 msgstr ""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - visualizza in chat la posizione corrente del personaggio."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr ""
@@ -257,7 +297,7 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr ""
 
-msgid "/exp - show party experience sharing options."
+msgid "\"Kills stats window\""
 msgstr ""
 
 msgid ""
@@ -265,10 +305,11 @@ msgid ""
 "##2?text"
 msgstr "Puoi fare la ricerca base usando il comando\n##2?text"
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Puoi comprare o vendere oggetti anche da/a altri giocatori.\nClicca col tasto destro sul giocatore e seleziona la voce \"Compra\" o \"Vendi\""
+msgid "\"Change move to target type\""
+msgstr ""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr ""
@@ -288,8 +329,8 @@ msgstr ""
 msgid "IGNORING COMMUNICATION"
 msgstr "IGNORA COMUNICAZIONI"
 
-msgid "WINDOWS"
-msgstr "WINDOWS"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "SUPPORTO"
@@ -334,6 +375,15 @@ msgstr "Puoi resettare la barra gialla, cliccando col tasto destro su di essa, s
 msgid "/who - print online players number to chat."
 msgstr "/who - visualizza in chat il numero dei giocatori online."
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway MSG - attiva/disattiva la modalità Pseudo Away."
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - visualizza l'Uptime del Client."
 
@@ -358,8 +408,10 @@ msgstr "/imitation NICK - attiva modalità Imitazione."
 msgid "\"Outfit shortcut 5\""
 msgstr ""
 
-msgid "KEYBOARD:"
-msgstr "TASTIERA:"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Puoi imitare altri giocatori selezionando la voce \"Imitazione\" dal menu contestuale del personaggio oppure digitando in chat il comando: /imitate playername."
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -371,12 +423,15 @@ msgstr ""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr "Notizie dal Server"
+msgid "Contributors to client development"
+msgstr "Collaboratori Client"
 
 msgid "\"Outfit shortcut 11\""
 msgstr ""
 
+msgid "\"Move right\""
+msgstr ""
+
 msgid "\"Item shortcut 11\""
 msgstr ""
 
@@ -400,8 +455,11 @@ msgstr ""
 msgid "\"Move to target\""
 msgstr ""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway MSG - attiva/disattiva la modalità Pseudo Away."
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr ""
@@ -424,8 +482,8 @@ msgstr "/ignoreall - aggiungi tutti i Whispers alla lista Ignora."
 msgid "\"Copy outfit\""
 msgstr ""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr ""
+msgid "Server news"
+msgstr "Notizie dal Server"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NICK - aggiungi personaggio alla lista Ignora."
@@ -436,14 +494,11 @@ msgstr ""
 msgid "\"Disable / enable game modifier keys\""
 msgstr ""
 
-msgid "Other contributors"
-msgstr "Altri Collaboratori"
+msgid "\"Change crazy Move mode\""
+msgstr ""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "La Comunicazione è spesso un fattore essenziale per aver successo in questo gioco. Puoi comunicare in diverse maniere:  Chattando e mostrando Emotes (vedere sopra), commerciando\n (click destro sul destinatario), e coi Whispers."
+msgid "/where - print current player position to chat."
+msgstr "/where - visualizza in chat la posizione corrente del personaggio."
 
 msgid "\"Attack\""
 msgstr ""
@@ -451,7 +506,7 @@ msgstr ""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - equipaggia la combinazione successiva."
 
-msgid "\"Move right\""
+msgid "/magicattack - attack target with magic."
 msgstr ""
 
 msgid ""
@@ -480,8 +535,8 @@ msgstr "/addignoreattack NAME - aggiungi nemico alla lista Ignora Attacchi."
 msgid "Android porting"
 msgstr "Porting per Android"
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - pulisci la Chat corrente."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr ""
@@ -504,6 +559,9 @@ msgstr "Commercio"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist NICK - aggiungi giocatore alla lista Lista Nera."
 
+msgid "\"Change map view mode\""
+msgstr ""
+
 msgid "\"Close chat tab\""
 msgstr ""
 
@@ -519,6 +577,9 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -530,13 +591,16 @@ msgstr "Collaboratori grafica"
 msgid "\"Target player\""
 msgstr ""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr ""
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -548,12 +612,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr ""
 
-msgid "\"Next chat tab\""
+msgid "/uploadlog - upload log into pastebin service."
 msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "Collaboratori ManaPlus"
 
+msgid "\"Emote shortcut 5\""
+msgstr ""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr ""
 
@@ -563,8 +630,10 @@ msgstr "Abilità di base"
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr ""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Puoi comprare o vendere oggetti anche da/a altri giocatori.\nClicca col tasto destro sul giocatore e seleziona la voce \"Compra\" o \"Vendi\""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase NICK - aggiungi personaggio alla lista Eliminati."
@@ -591,6 +660,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr "##2               SDL, SDL_image, SDL_mixer (Media framework)\n##2                     SDL_net (Networking framework)\n##2                        Guichan (GUI framework)\n##2                   libxml2 (XML parsing and writing)\n##2                          PhysFS (Data files)\n##2                        libcurl (HTTP downloads)\n##2                            zlib (Archives)"
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend NICK, /befriend NICK - aggiungi personaggio alla lista Amici."
 
@@ -646,15 +719,21 @@ msgid ""
 "nick."
 msgstr "/msg NICK text, /whisper NICK text, /w NICK text - manda un Whisper al personaggio scelto."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr ""
 
-msgid "\"Item shortcut 1\""
+msgid "/open URL - open url in browser."
 msgstr ""
 
 msgid "Commands"
 msgstr "Comandi"
 
+msgid "WINDOWS"
+msgstr "WINDOWS"
+
 msgid "\"Outfit shortcut 9\""
 msgstr ""
 
@@ -669,7 +748,10 @@ msgid ""
 " of the following:"
 msgstr " La lista giocatore visualizza tutti i giocatori con cui hai fatto conoscenza.  Essi sono catalogati come segue:"
 
-msgid "\"Change attack weapon type\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
 msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
@@ -678,6 +760,9 @@ msgstr "/outfit prev - equipaggia combinazione precedente."
 msgid "\"Crazy moves\""
 msgstr ""
 
+msgid "Powered By"
+msgstr "Powered by"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -699,7 +784,7 @@ msgstr ""
 msgid "\"Set direction right\""
 msgstr ""
 
-msgid "\"Move to home location\""
+msgid "/announce MESSAGE - show global message."
 msgstr ""
 
 msgid "Player relations"
@@ -734,17 +819,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr ""
 
-msgid "\"Kills stats window\""
+msgid "\"Move to home location\""
 msgstr ""
 
 msgid "\"Toggle chat\""
 msgstr ""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr ""
 
-msgid "Manaplus Developers"
-msgstr "Sviluppatori ManaPlus"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - pulisci la Chat corrente."
 
 msgid "\"On / off audio\""
 msgstr ""
@@ -761,8 +849,8 @@ msgstr "Puoi modificare ogni combinazione di tasti dai settaggi della sezione 'T
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - visualizza nella chat 'Debug' le directory usate dal Client."
 
-msgid "Powered By"
-msgstr "Powered by"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - sconnessione rapida."
@@ -779,12 +867,15 @@ msgstr ""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/disregard NICK - aggiungi il giocatore alla lista Ignora."
 
-msgid "\"Change crazy Move mode\""
+msgid "\"Item shortcut 1\""
 msgstr ""
 
 msgid "\"Outfit shortcut 8\""
 msgstr ""
 
+msgid "Manaplus Developers"
+msgstr "Sviluppatori ManaPlus"
+
 msgid "\"Change imitation mode\""
 msgstr ""
 
@@ -796,12 +887,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr ""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress NICK - rimuove tutti i vestiti dal personaggio scelto. Funziona solo in locale."
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -810,10 +907,13 @@ msgstr ""
 msgid "\"Outfit shortcut 14\""
 msgstr ""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr ""
 
-msgid "\"Switch pvp attack\""
+msgid "/enablehighlight - enable highlight in current tab."
 msgstr ""
 
 msgid "\"Emote shortcut window\""
@@ -822,17 +922,26 @@ msgstr ""
 msgid "\"Bot checker window\""
 msgstr ""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr "/mail NICK MSG - manda un messaggio offline al giocatore desiderato. Funziona solo sul server The Mana World."
 
+msgid "DOWNLOADS"
+msgstr ""
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr ""
 
 msgid "About The Mana World"
 msgstr ""
 
-msgid "\"Emote shortcut 5\""
+msgid "/testparticle FILENAME - set test particle on player."
 msgstr ""
 
 msgid "\"Smilie\""
@@ -857,8 +966,8 @@ msgstr "Puoi vedere l'equipaggiamento di altri giocatori,\ncliccando col tasto d
 msgid "Whispers"
 msgstr "Whispers"
 
-msgid "Search string not found."
-msgstr "La voce cercata non è stata trovata."
+msgid "/url URL - insert url into chat."
+msgstr ""
 
 msgid "\"Wear outfit\""
 msgstr ""
@@ -901,6 +1010,9 @@ msgstr ""
 msgid "About"
 msgstr "Info"
 
+msgid "\"Change attack weapon type\""
+msgstr ""
+
 msgid "\"Emote shortcut 12\""
 msgstr ""
 
@@ -960,6 +1072,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr "Tuttavia, puoi tutelarti da questi giocatori ignorandoli.  Clicca sul giocatore col tasto destro del mouse e seleziona la voce 'ignore' \ndal menu contestuale.\nPuoi personalizzare le relazioni del tuo personaggio\n dal menu' 'Setup', in cui puoi trovare la lista di tutti i giocatori coinvolti.  Per accedervi\n seleziona 'Setup' nell'angolo dello schermo in alto a destra, nella sezione 'Relazioni'."
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr "Patch differenti"
 
diff --git a/data/translations/help/nl_BE.po b/data/translations/help/nl_BE.po
index 83ff77603..2bc4f8580 100644
--- a/data/translations/help/nl_BE.po
+++ b/data/translations/help/nl_BE.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -14,10 +14,13 @@ msgstr ""
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
 msgstr ""
 
 msgid "To read about whispering and other chat commands, look here:"
@@ -35,10 +38,7 @@ msgstr ""
 msgid "\"Target & attack\""
 msgstr "\"Viseren en Aanvallen\""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
+msgid "/atkhuman - select and attack nearest player."
 msgstr ""
 
 msgid "\"Emote shortcut 11\""
@@ -52,19 +52,20 @@ msgid ""
 " window and drop them."
 msgstr ""
 
-msgid "\"Ignore input 1\""
+msgid "\"Outfit shortcut 12\""
 msgstr ""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - toon tekst cache info."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr "\"Kleding Venster\""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr ""
+msgid "KEYBOARD:"
+msgstr "TOETSENBORD:"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -80,6 +81,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr ""
 
+msgid "GM"
+msgstr ""
+
 msgid "\"Target NPC\""
 msgstr "\"NPC viseren\""
 
@@ -95,8 +99,8 @@ msgid ""
 "then click on warp what you want."
 msgstr ""
 
-msgid "\"Chat window\""
-msgstr "\"Gespreksvenster\""
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - voeg nick toe aan neutrale relatielijst."
@@ -110,7 +114,7 @@ msgstr "/addpriorityattack NAME - Monster aan de prioriteitsaanvalslijst toevoeg
 msgid "Back to Index"
 msgstr "Terug naar de Opgavetabel"
 
-msgid "DOWNLOADS"
+msgid "\"Quit\""
 msgstr ""
 
 msgid "THE PLAYER LIST"
@@ -119,22 +123,43 @@ msgstr "DE SPELERLIJST"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - Laad de winkelprijs van de schijf."
 
+msgid "Search string not found."
+msgstr ""
+
 msgid "\"Quests window\""
 msgstr "\"Opdrachtenvenster\""
 
+msgid "Other contributors"
+msgstr "Andere bijdragers"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr ""
 
+msgid "\"Next chat tab\""
+msgstr "\"Volgende gesprekstab\""
+
+msgid "Support"
+msgstr "Ondersteuning"
+
 msgid "\"Quick drop window\""
 msgstr ""
 
 msgid "\"Screenshot\""
 msgstr "\"Schermafdruk\""
 
-msgid "Support"
-msgstr "Ondersteuning"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr ""
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr ""
 
 msgid "\"Emote shortcut 1\""
 msgstr ""
@@ -147,6 +172,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr ""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -155,16 +183,22 @@ msgstr ""
 msgid "/me text - send text to chat as /me command in irc."
 msgstr ""
 
+msgid "\"Chat window\""
+msgstr "\"Gespreksvenster\""
+
 msgid "\"Emote shortcut 10\""
 msgstr ""
 
 msgid "\"Item shortcut 14\""
 msgstr ""
 
+msgid "\"Ignore input 1\""
+msgstr ""
+
 msgid "Mana Contributors"
 msgstr "Manaplus Bijdragers"
 
-msgid "\"Change map view mode\""
+msgid "Content devs"
 msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
@@ -187,6 +221,12 @@ msgstr ""
 msgid "Debug"
 msgstr "Debug"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr ""
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NAME - Monster aan de aanvalslijst toevoegen."
 
@@ -212,7 +252,7 @@ msgstr ""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr ""
 
-msgid "\"Quit\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
 msgstr ""
 
 msgid "/outfit N - wear outfit number N."
@@ -233,8 +273,8 @@ msgstr "\"Beweeg naar beneden\""
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - heelt nick."
 
-msgid "Contributors to client development"
-msgstr "Bijdragers tot de 'client'-ontwikkeling"
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr "\"Instellingenvenster\""
@@ -245,7 +285,7 @@ msgstr ""
 msgid "\"Set direction up\""
 msgstr ""
 
-msgid "/where - print current player position to chat."
+msgid "/dumpe - dump environment variables into chat."
 msgstr ""
 
 msgid "Instructions"
@@ -256,17 +296,18 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr ""
 
-msgid "/exp - show party experience sharing options."
-msgstr ""
+msgid "\"Kills stats window\""
+msgstr "\"Doodstatusvenster\""
 
 msgid ""
 "You can do basic searching in help by using command\n"
 "##2?text"
 msgstr ""
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
+msgid "\"Change move to target type\""
+msgstr "\"Wijzig Bewegen tot aan Doel type\""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
 msgstr ""
 
 msgid "\"Enable/disable trading\""
@@ -287,8 +328,8 @@ msgstr ""
 msgid "IGNORING COMMUNICATION"
 msgstr "COMMUNICATIE NEGEREN"
 
-msgid "WINDOWS"
-msgstr "VENSTERS"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "ONDERSTEUNING"
@@ -333,6 +374,15 @@ msgstr ""
 msgid "/who - print online players number to chat."
 msgstr ""
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr ""
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr ""
 
@@ -357,8 +407,10 @@ msgstr ""
 msgid "\"Outfit shortcut 5\""
 msgstr ""
 
-msgid "KEYBOARD:"
-msgstr "TOETSENBORD:"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr ""
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -370,12 +422,15 @@ msgstr ""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr ""
+msgid "Contributors to client development"
+msgstr "Bijdragers tot de 'client'-ontwikkeling"
 
 msgid "\"Outfit shortcut 11\""
 msgstr ""
 
+msgid "\"Move right\""
+msgstr "\"Bewegen naar rechts\""
+
 msgid "\"Item shortcut 11\""
 msgstr ""
 
@@ -399,7 +454,10 @@ msgstr ""
 msgid "\"Move to target\""
 msgstr "\"Beweeg tot aan Doel\""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
 msgstr ""
 
 msgid "\"Enable / disable away mode\""
@@ -423,7 +481,7 @@ msgstr ""
 msgid "\"Copy outfit\""
 msgstr "\"Kopiëer Kledij\""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Server news"
 msgstr ""
 
 msgid "/ignore NICK - add nick to ignore list."
@@ -435,13 +493,10 @@ msgstr "\"Voorwerp Snelkoppelingstoets\""
 msgid "\"Disable / enable game modifier keys\""
 msgstr ""
 
-msgid "Other contributors"
-msgstr "Andere bijdragers"
+msgid "\"Change crazy Move mode\""
+msgstr ""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
+msgid "/where - print current player position to chat."
 msgstr ""
 
 msgid "\"Attack\""
@@ -450,8 +505,8 @@ msgstr "\"Aanvallen\""
 msgid "/outfit next - wear next outfit."
 msgstr ""
 
-msgid "\"Move right\""
-msgstr "\"Bewegen naar rechts\""
+msgid "/magicattack - attack target with magic."
+msgstr ""
 
 msgid ""
 "You can set away mode,\n"
@@ -479,7 +534,7 @@ msgstr ""
 msgid "Android porting"
 msgstr "Android porting"
 
-msgid "/clear - clear current chat tab."
+msgid "Tabs"
 msgstr ""
 
 msgid "\"Social window\""
@@ -503,6 +558,9 @@ msgstr ""
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr ""
 
+msgid "\"Change map view mode\""
+msgstr ""
+
 msgid "\"Close chat tab\""
 msgstr "\"Sluit Gespreks tab\""
 
@@ -518,6 +576,9 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -529,13 +590,16 @@ msgstr ""
 msgid "\"Target player\""
 msgstr "\"Speler viseren\""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr ""
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -547,12 +611,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr "\"Debugvenster\""
 
-msgid "\"Next chat tab\""
-msgstr "\"Volgende gesprekstab\""
+msgid "/uploadlog - upload log into pastebin service."
+msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "Manaplus Bijdragers"
 
+msgid "\"Emote shortcut 5\""
+msgstr ""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr "\"Kopieer je huidige uitrusting naar 'Kledij'\""
 
@@ -562,8 +629,10 @@ msgstr ""
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr "\"Wijzig Bewegen tot aan Doel type\""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr ""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr ""
@@ -590,6 +659,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr ""
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr ""
 
@@ -645,15 +718,21 @@ msgid ""
 "nick."
 msgstr ""
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr ""
 
-msgid "\"Item shortcut 1\""
+msgid "/open URL - open url in browser."
 msgstr ""
 
 msgid "Commands"
 msgstr "Bevelen"
 
+msgid "WINDOWS"
+msgstr "VENSTERS"
+
 msgid "\"Outfit shortcut 9\""
 msgstr ""
 
@@ -668,8 +747,11 @@ msgid ""
 " of the following:"
 msgstr ""
 
-msgid "\"Change attack weapon type\""
-msgstr "\"Verander Aanvalswapen Type\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
 msgstr ""
@@ -677,6 +759,9 @@ msgstr ""
 msgid "\"Crazy moves\""
 msgstr "\"vreemde bewegingen\""
 
+msgid "Powered By"
+msgstr ""
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -698,8 +783,8 @@ msgstr "\"Volgende gesprekslijn\""
 msgid "\"Set direction right\""
 msgstr ""
 
-msgid "\"Move to home location\""
-msgstr "\"Verplaats naar thuislokatie\""
+msgid "/announce MESSAGE - show global message."
+msgstr ""
 
 msgid "Player relations"
 msgstr ""
@@ -733,17 +818,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr "\"Vaardigheidsvenster\""
 
-msgid "\"Kills stats window\""
-msgstr "\"Doodstatusvenster\""
+msgid "\"Move to home location\""
+msgstr "\"Verplaats naar thuislokatie\""
 
 msgid "\"Toggle chat\""
 msgstr ""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr "\"Aanvalstype veranderen\""
 
-msgid "Manaplus Developers"
-msgstr "Manaplus Ontwikkelaars"
+msgid "/clear - clear current chat tab."
+msgstr ""
 
 msgid "\"On / off audio\""
 msgstr ""
@@ -760,7 +848,7 @@ msgstr ""
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr ""
 
-msgid "Powered By"
+msgid "/movetohome - move to home position."
 msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
@@ -778,12 +866,15 @@ msgstr ""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr ""
 
-msgid "\"Change crazy Move mode\""
+msgid "\"Item shortcut 1\""
 msgstr ""
 
 msgid "\"Outfit shortcut 8\""
 msgstr ""
 
+msgid "Manaplus Developers"
+msgstr "Manaplus Ontwikkelaars"
+
 msgid "\"Change imitation mode\""
 msgstr ""
 
@@ -795,12 +886,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr ""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr ""
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -809,10 +906,13 @@ msgstr ""
 msgid "\"Outfit shortcut 14\""
 msgstr ""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr ""
 
-msgid "\"Switch pvp attack\""
+msgid "/enablehighlight - enable highlight in current tab."
 msgstr ""
 
 msgid "\"Emote shortcut window\""
@@ -821,17 +921,26 @@ msgstr ""
 msgid "\"Bot checker window\""
 msgstr ""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr ""
 
+msgid "DOWNLOADS"
+msgstr ""
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr ""
 
 msgid "About The Mana World"
 msgstr "Over 'The Mana World'"
 
-msgid "\"Emote shortcut 5\""
+msgid "/testparticle FILENAME - set test particle on player."
 msgstr ""
 
 msgid "\"Smilie\""
@@ -856,7 +965,7 @@ msgstr ""
 msgid "Whispers"
 msgstr "Fluisters"
 
-msgid "Search string not found."
+msgid "/url URL - insert url into chat."
 msgstr ""
 
 msgid "\"Wear outfit\""
@@ -900,6 +1009,9 @@ msgstr ""
 msgid "About"
 msgstr "Over"
 
+msgid "\"Change attack weapon type\""
+msgstr "\"Verander Aanvalswapen Type\""
+
 msgid "\"Emote shortcut 12\""
 msgstr ""
 
@@ -959,6 +1071,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr ""
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr ""
 
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 25135da5c..27ff61998 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,14 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
-msgstr "\"Skrót ubioru 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
+msgstr "\"Przełącz atak PvP\""
 
 msgid "To read about whispering and other chat commands, look here:"
 msgstr "O szeptach i innych poleceniach czatu, przeczytasz tutaj:"
@@ -37,11 +40,8 @@ msgstr "Możesz wybrać inną skórkę.⏎\nBy to zrobić otwórz ustawienia i w
 msgid "\"Target & attack\""
 msgstr "\"Namierz cel i zaatakuj\""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr "Większość komend działa w szeptach.⏎\nNa przykład komenda /imituj w szepcie z nikiem1.⏎\npodobnie do komendy /imituj nick1."
+msgid "/atkhuman - select and attack nearest player."
+msgstr ""
 
 msgid "\"Emote shortcut 11\""
 msgstr "\"Skrót Emotki 11\""
@@ -54,19 +54,20 @@ msgid ""
 " window and drop them."
 msgstr "By dodać przedmiot do paska skrótów, kliknij na przedmiot w oknie ekwipunku,⏎\npotem kliknij na komórkę w oknie skrótów by przypisać przedmiot⏎\nBy zmienić kolejność przedmiotów w oknie skrótów, kliknij i przeciągnij je pomiędzy komórkami.⏎\nBy usunąć przedmiot po prostu przeciągnij go po za okno i upuść."
 
-msgid "\"Ignore input 1\""
-msgstr "\"Ignoruj wprowadzenie 1\""
+msgid "\"Outfit shortcut 12\""
+msgstr "\"Skrót ubioru 12\""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - pokaż informację o cache."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr "\"Okno strojów\""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Możesz naśladować innych graczy wybierając \"imitacja\" z menu kontekstowego gracza lub wpisać komendę czatu: /imitate playername."
+msgid "KEYBOARD:"
+msgstr "KLAWIATURA"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -82,6 +83,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr "\"Ustaw w dolny kierunek\""
 
+msgid "GM"
+msgstr ""
+
 msgid "\"Target NPC\""
 msgstr "\"Namierz NPC\""
 
@@ -97,8 +101,8 @@ msgid ""
 "then click on warp what you want."
 msgstr "Możesz chodzić do warpów automatycznie.⏎\nOtwórz Okno Społeczności (###keyWindowSocial;) i wybierz zakładkę GPS.⏎\npotem kliknij na żądanym warpie."
 
-msgid "\"Chat window\""
-msgstr "\"Okno Czatu\""
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - dodaj nicka do listy o neutralnym stosunku."
@@ -112,8 +116,8 @@ msgstr "/addpriorityattack NAZWA - dodaj potwora do listy priorytetów ataku."
 msgid "Back to Index"
 msgstr "Wróć do Indeksu"
 
-msgid "DOWNLOADS"
-msgstr ""
+msgid "\"Quit\""
+msgstr "\"Wyjdź\""
 
 msgid "THE PLAYER LIST"
 msgstr "LISTA GRACZY"
@@ -121,22 +125,43 @@ msgstr "LISTA GRACZY"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - wczytaj ceny sklepu z dysku."
 
+msgid "Search string not found."
+msgstr "Nie znaleziono poszukiwanego ciągu."
+
 msgid "\"Quests window\""
 msgstr "\"Okno Misji\""
 
+msgid "Other contributors"
+msgstr "Pozostali kontrybutorzy."
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr "Możesz wyłączyć żółty pasek.⏎\nwciskając ###keyDisableGameModifiers;."
 
+msgid "\"Next chat tab\""
+msgstr "\"Następna zakładka czatu\""
+
+msgid "Support"
+msgstr "Wsparcie"
+
 msgid "\"Quick drop window\""
 msgstr "\"Okno szybkiego upuszczania\""
 
 msgid "\"Screenshot\""
 msgstr "\"Zrzut ekranu\""
 
-msgid "Support"
-msgstr "Wsparcie"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "Większość komend działa w szeptach.⏎\nNa przykład komenda /imituj w szepcie z nikiem1.⏎\npodobnie do komendy /imituj nick1."
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "Komunikacja jest często podstawą do odniesienia sukcesu w tej grze. Możesz porozumiewać \n się na różne sposoby:  Poprzez czat i okazywanie emocji (widzianych nad postaciami), poprzez handel\n (za sprawą kontekstowego menu pod prawym kliknięciem myszy)with the, i poprzez szeptanie."
 
 msgid "\"Emote shortcut 1\""
 msgstr "\"Skrót Emotki 1\""
@@ -149,6 +174,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr "\"Skrót ubioru 13\""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -157,17 +185,23 @@ msgstr "Możesz poprawić swoje umiejętności zwiększając poziom pracy. Każd
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me tekst - wyślij wiadomość do czatu, analogiczne do komendy /me z irca."
 
+msgid "\"Chat window\""
+msgstr "\"Okno Czatu\""
+
 msgid "\"Emote shortcut 10\""
 msgstr "\"Skrót Emotki 10\""
 
 msgid "\"Item shortcut 14\""
 msgstr "\"Skrót przedmiotu 14\""
 
+msgid "\"Ignore input 1\""
+msgstr "\"Ignoruj wprowadzenie 1\""
+
 msgid "Mana Contributors"
 msgstr "Kontrybutorzy Mana"
 
-msgid "\"Change map view mode\""
-msgstr "\"Zmień tryb widoku mapy\""
+msgid "Content devs"
+msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
 msgstr "/query NICK, /q NICK - otwiera nową zakładkę szeptu dla nick'a.."
@@ -189,6 +223,12 @@ msgstr "\"Skrót Emotki 7\""
 msgid "Debug"
 msgstr "Debug"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr "Strona: @@http://manaplus.org/|http://manaplus.org/@@"
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NAZWA - dodaj potwora do listy ataku."
 
@@ -214,8 +254,8 @@ msgstr "\"Skrót ubioru 6\""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - ustaw licznik upuszczenia na wybraną wartość."
 
-msgid "\"Quit\""
-msgstr "\"Wyjdź\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr ""
 
 msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - załóż strój o numerze N."
@@ -235,8 +275,8 @@ msgstr "\"Idź w dół\""
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - uzdrów nick."
 
-msgid "Contributors to client development"
-msgstr "Kontrybutorzy klienta gry."
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr "\"Okno Ustawień\""
@@ -247,8 +287,8 @@ msgstr "/removeattack NAZWA - usuń potwora z listy ataku."
 msgid "\"Set direction up\""
 msgstr "\"Ustaw w górny kierunek\""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - napisz w czacie obecną pozycję gracza."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr ""
@@ -258,18 +298,19 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr "Jeśli klient działa zbyt wolno, możesz poprawić prędkość czytając to: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 
-msgid "/exp - show party experience sharing options."
-msgstr ""
+msgid "\"Kills stats window\""
+msgstr "\"Okno statystyk bitewnych\""
 
 msgid ""
 "You can do basic searching in help by using command\n"
 "##2?text"
 msgstr "Możesz wykonać podstawowe wyszukiwanie w pomocy używając komendy⏎\n##2?text"
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Możesz kupowac lub sprzedawać przedmioty w sklepach graczy.\nKliknij prawym przyciskiem na graczu i wybierz \"Kup\" lub \"Sprzedaj\""
+msgid "\"Change move to target type\""
+msgstr "\"Zmień sposób podchodzenia do celu\""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr "\"Aktywuj/Deaktywuj Handlowanie\""
@@ -289,8 +330,8 @@ msgstr "Jeżeli masz jakieś problemy, proszę przeczytaj najpierw FAQ,⏎ \nJe�
 msgid "IGNORING COMMUNICATION"
 msgstr "IGNOROWANIE KOMUNIKACJI"
 
-msgid "WINDOWS"
-msgstr "OKNA"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "WSPARCIE"
@@ -335,6 +376,15 @@ msgstr "Możesz przywrócić ustawienia zółtego paska,\nklikając na nim prawy
 msgid "/who - print online players number to chat."
 msgstr "/who - wypisz w czacie liczbe graczy online."
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway WIADOMOŚĆ - ustaw/zdejmij tryb pseudo poza klawiaturą."
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - pokaż uptime klienta."
 
@@ -359,8 +409,10 @@ msgstr "/imitation NICK - rozpocznij tryb imitacji."
 msgid "\"Outfit shortcut 5\""
 msgstr "\"Skrót ubioru 5\""
 
-msgid "KEYBOARD:"
-msgstr "KLAWIATURA"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Możesz naśladować innych graczy wybierając \"imitacja\" z menu kontekstowego gracza lub wpisać komendę czatu: /imitate playername."
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -372,12 +424,15 @@ msgstr "\"Przewiń czat w dół\""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr "Wiadomości z serwera"
+msgid "Contributors to client development"
+msgstr "Kontrybutorzy klienta gry."
 
 msgid "\"Outfit shortcut 11\""
 msgstr "\"Skrót ubioru 11\""
 
+msgid "\"Move right\""
+msgstr "\"Idź w prawo\""
+
 msgid "\"Item shortcut 11\""
 msgstr "\"Skrót przedmiotu 11\""
 
@@ -401,8 +456,11 @@ msgstr "Na temat żółtego paska możesz przeczytać tutaj:\n@@http://manaplus.
 msgid "\"Move to target\""
 msgstr "\"Podejdź do celu\""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway WIADOMOŚĆ - ustaw/zdejmij tryb pseudo poza klawiaturą."
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr "\"Aktywuj/ deaktywuj tryb AFK\""
@@ -425,8 +483,8 @@ msgstr "/ignoreall - umieść wszystkie szepty na liście ignorowanych."
 msgid "\"Copy outfit\""
 msgstr "\"Kopiuj strój\""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Strona: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Server news"
+msgstr "Wiadomości z serwera"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NICK - dodaj nick'a do listy ignorowanych."
@@ -437,14 +495,11 @@ msgstr "\"Klawisz skrótów do przedmiotów\""
 msgid "\"Disable / enable game modifier keys\""
 msgstr "\"Włącz/ wyłącz klawisze modyfikatorów gry\""
 
-msgid "Other contributors"
-msgstr "Pozostali kontrybutorzy."
+msgid "\"Change crazy Move mode\""
+msgstr "\"Zmień tryb szalonych ruchów\""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "Komunikacja jest często podstawą do odniesienia sukcesu w tej grze. Możesz porozumiewać \n się na różne sposoby:  Poprzez czat i okazywanie emocji (widzianych nad postaciami), poprzez handel\n (za sprawą kontekstowego menu pod prawym kliknięciem myszy)with the, i poprzez szeptanie."
+msgid "/where - print current player position to chat."
+msgstr "/where - napisz w czacie obecną pozycję gracza."
 
 msgid "\"Attack\""
 msgstr "\"Atak\""
@@ -452,8 +507,8 @@ msgstr "\"Atak\""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - załóż następny strój."
 
-msgid "\"Move right\""
-msgstr "\"Idź w prawo\""
+msgid "/magicattack - attack target with magic."
+msgstr ""
 
 msgid ""
 "You can set away mode,\n"
@@ -481,8 +536,8 @@ msgstr "/addignoreattack NAME - dodaj potwora do listy ignorowanych celów."
 msgid "Android porting"
 msgstr "Portowanie na Androida"
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - wyczyść obecną zakładkę czatu."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr "\"Okno społeczne\""
@@ -505,6 +560,9 @@ msgstr "Handel"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist KSYWKA - dodaj KSYWKA do czarnej listy."
 
+msgid "\"Change map view mode\""
+msgstr "\"Zmień tryb widoku mapy\""
+
 msgid "\"Close chat tab\""
 msgstr "\"Zamknij zakładkę czatu\""
 
@@ -520,6 +578,9 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -531,13 +592,16 @@ msgstr "Deweloperzy zasobów graficznych"
 msgid "\"Target player\""
 msgstr "\"Namierz Gracza\""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr ""
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -549,12 +613,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr "\"Okno diagnostyczne\""
 
-msgid "\"Next chat tab\""
-msgstr "\"Następna zakładka czatu\""
+msgid "/uploadlog - upload log into pastebin service."
+msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "Kontrybutorzy ManaPlus"
 
+msgid "\"Emote shortcut 5\""
+msgstr "\"Skrót Emotki 5\""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr "\"Skopiuj ekwipunek do stroju\""
 
@@ -564,8 +631,10 @@ msgstr "Podstawowe zdolności:"
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr "\"Zmień sposób podchodzenia do celu\""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Możesz kupowac lub sprzedawać przedmioty w sklepach graczy.\nKliknij prawym przyciskiem na graczu i wybierz \"Kup\" lub \"Sprzedaj\""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase NICK - dodaj nick'a do listy wymazywanych."
@@ -592,6 +661,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr ""
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend NICK, /befriend NICK - dodaj nick'a do listy przyjaciół."
 
@@ -647,15 +720,21 @@ msgid ""
 "nick."
 msgstr "/msg NICK tekst, /whisper NICK tekst, /w NICK tekst - wyslij wiadomośc szeptem do nick'a."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr "\"Skrót Emotki 14\""
 
-msgid "\"Item shortcut 1\""
-msgstr "\"Skrót przedmiotu 1\""
+msgid "/open URL - open url in browser."
+msgstr ""
 
 msgid "Commands"
 msgstr "Komendy"
 
+msgid "WINDOWS"
+msgstr "OKNA"
+
 msgid "\"Outfit shortcut 9\""
 msgstr "\"Skrót ubioru 9\""
 
@@ -670,8 +749,11 @@ msgid ""
 " of the following:"
 msgstr "Lista graczy zawiera twych znajomych. Skategoryzowani są jako jedni z następujących:"
 
-msgid "\"Change attack weapon type\""
-msgstr "\"Zmień rodzaj broni\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
 msgstr "/outfit prev - załóż poprzedni strój."
@@ -679,6 +761,9 @@ msgstr "/outfit prev - załóż poprzedni strój."
 msgid "\"Crazy moves\""
 msgstr "\"Szalone ruchy\""
 
+msgid "Powered By"
+msgstr "Wspierane przez"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -700,8 +785,8 @@ msgstr "\"Następny wiersz czatu\""
 msgid "\"Set direction right\""
 msgstr "\"Ustaw w prawy kierunek\""
 
-msgid "\"Move to home location\""
-msgstr "\"Podejdź do lokacji domowej\""
+msgid "/announce MESSAGE - show global message."
+msgstr ""
 
 msgid "Player relations"
 msgstr "Relacje z graczami"
@@ -735,17 +820,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr "\"Okno Umiejętności\""
 
-msgid "\"Kills stats window\""
-msgstr "\"Okno statystyk bitewnych\""
+msgid "\"Move to home location\""
+msgstr "\"Podejdź do lokacji domowej\""
 
 msgid "\"Toggle chat\""
 msgstr "\"Przełącznik Czatu\""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr "\"Zmień rodzaj ataku\""
 
-msgid "Manaplus Developers"
-msgstr "Deweloperzy Manaplus"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - wyczyść obecną zakładkę czatu."
 
 msgid "\"On / off audio\""
 msgstr "\"Włącz/ wyłącz dźwięk\""
@@ -762,8 +850,8 @@ msgstr "Możesz zmienić jakikolwiek klawisz w ustawieniach klawiatury."
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - pokaż foldery klienta w zakładce czatu debug."
 
-msgid "Powered By"
-msgstr "Wspierane przez"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - szybkie rozłączenie się z serwerem."
@@ -780,12 +868,15 @@ msgstr "\"Skrót Emotki 13\""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/Lekceważ  NICK - dodaj nick do listy lekceważonych"
 
-msgid "\"Change crazy Move mode\""
-msgstr "\"Zmień tryb szalonych ruchów\""
+msgid "\"Item shortcut 1\""
+msgstr "\"Skrót przedmiotu 1\""
 
 msgid "\"Outfit shortcut 8\""
 msgstr "\"Skrót ubioru 8\""
 
+msgid "Manaplus Developers"
+msgstr "Deweloperzy Manaplus"
+
 msgid "\"Change imitation mode\""
 msgstr "\"Zmień tryb imitacji\""
 
@@ -797,12 +888,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr "\"Zresetuj tryb wideo do bezpiecznej wersji\""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress KSYWKA - usuwa wszystkie ubrania z 'ksywka'. Efekt wyłącznie lokalny."
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -811,11 +908,14 @@ msgstr "W przeciwnym razie zobacz sekcje @@team|Development Team@@ by zobaczyć
 msgid "\"Outfit shortcut 14\""
 msgstr "\"Skrót ubioru 14\""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr "\"Szybkie upuszczenie N przedmiotów z pozycji 0\""
 
-msgid "\"Switch pvp attack\""
-msgstr "\"Przełącz atak PvP\""
+msgid "/enablehighlight - enable highlight in current tab."
+msgstr ""
 
 msgid "\"Emote shortcut window\""
 msgstr "\"Okno Skrótów Emotek\""
@@ -823,18 +923,27 @@ msgstr "\"Okno Skrótów Emotek\""
 msgid "\"Bot checker window\""
 msgstr "\"Okno wykrywacza botów\""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr "/mail NICK WIADOMOŚĆ - wyślij wiadomość offline do NICK. Działa tylko na serwerze tmw."
 
+msgid "DOWNLOADS"
+msgstr ""
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr "\"Skrót przedmiotu 15\""
 
 msgid "About The Mana World"
 msgstr "O The Mana World"
 
-msgid "\"Emote shortcut 5\""
-msgstr "\"Skrót Emotki 5\""
+msgid "/testparticle FILENAME - set test particle on player."
+msgstr ""
 
 msgid "\"Smilie\""
 msgstr "\"Emotikonka\""
@@ -858,8 +967,8 @@ msgstr "Możesz zobaczyć wyekwipowane przedmioty innych graczy,⏎\nklikając p
 msgid "Whispers"
 msgstr "Szepty"
 
-msgid "Search string not found."
-msgstr "Nie znaleziono poszukiwanego ciągu."
+msgid "/url URL - insert url into chat."
+msgstr ""
 
 msgid "\"Wear outfit\""
 msgstr "\"Nałóż strój\""
@@ -902,6 +1011,9 @@ msgstr "Może się okazać że nie cała komunikacja ci się podoba. Podczas gdy
 msgid "About"
 msgstr "O..."
 
+msgid "\"Change attack weapon type\""
+msgstr "\"Zmień rodzaj broni\""
+
 msgid "\"Emote shortcut 12\""
 msgstr "\"Skrót Emotki 12\""
 
@@ -961,6 +1073,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr "Jednak możesz się chronić przed takimi graczami ignorując ich.⏎\nPrawym przyciskiem myszy klikając na nim i wybierając w menu kontekstowym \"Ignoruj\"⏎\nalbo \"Odignoruj\"(zobacz niżej). Możesz dostroić swoje relacje między innymi graczami w menu \"Ustawienia\",⏎\ngdzie znajduje się lista wszystkich graczy jakich dodałeś do niej. By otworzyć to menu, wybierz \"Ustawienia\",⏎\nw górnym prawym rogu ekranu, potem wybierz \"Relacje\"."
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr "Rozmaite łatki"
 
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index cb54948dd..ef47d73e7 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/manaplus/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,14 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
-msgstr "\"Atalho de roupa 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
+msgstr ""
 
 msgid "To read about whispering and other chat commands, look here:"
 msgstr "Para ler sobre sussurros e outros comandos de chat, veja aqui: "
@@ -36,10 +39,7 @@ msgstr ""
 msgid "\"Target & attack\""
 msgstr "\"Selecionar & atacar\""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
+msgid "/atkhuman - select and attack nearest player."
 msgstr ""
 
 msgid "\"Emote shortcut 11\""
@@ -53,19 +53,20 @@ msgid ""
 " window and drop them."
 msgstr ""
 
-msgid "\"Ignore input 1\""
-msgstr "\"Ignorar input 1\""
+msgid "\"Outfit shortcut 12\""
+msgstr "\"Atalho de roupa 12\""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - mostra informações de cache de texto"
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr "\"Janela de roupas\""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Você pode imitar outros jogadores selecionando a opção \"imitar\" no menu ou digitar o comando: /imitate nomedojogador"
+msgid "KEYBOARD:"
+msgstr "TECLADO:"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -81,6 +82,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr "\"Definir direção para baixo\""
 
+msgid "GM"
+msgstr ""
+
 msgid "\"Target NPC\""
 msgstr "\"Selecionar NPC\""
 
@@ -96,8 +100,8 @@ msgid ""
 "then click on warp what you want."
 msgstr ""
 
-msgid "\"Chat window\""
-msgstr "\"Janela de bate-papo\""
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - adiciona um u nick neutro na lista de relações"
@@ -111,7 +115,7 @@ msgstr "/addpriorityattack NAME - adiciona um monstro na lista de prioridades"
 msgid "Back to Index"
 msgstr "Voltar ao inicio"
 
-msgid "DOWNLOADS"
+msgid "\"Quit\""
 msgstr ""
 
 msgid "THE PLAYER LIST"
@@ -120,22 +124,43 @@ msgstr "A LISTA DE JOGADORES"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - Carrega preços de shop do disco."
 
+msgid "Search string not found."
+msgstr ""
+
 msgid "\"Quests window\""
 msgstr "\"Janela de missões\""
 
+msgid "Other contributors"
+msgstr "Outros contribuidores"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr "Você pode desabilitar a barra amarela\npressionando ###keyDisableGameModifiers;."
 
+msgid "\"Next chat tab\""
+msgstr ""
+
+msgid "Support"
+msgstr "Suporte"
+
 msgid "\"Quick drop window\""
 msgstr "\"Janela descarte rápido\""
 
 msgid "\"Screenshot\""
 msgstr "\"Screenshot\""
 
-msgid "Support"
-msgstr "Suporte"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr ""
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "A comunicação muitas vezes essencial para o sucesso neste jogo. Você pode se comunicar de várias maneiras: Conversando e mostrando emoções (veja acima), por negociação (com o menu do botão direito), e sussurrando."
 
 msgid "\"Emote shortcut 1\""
 msgstr "\"Atalho para emoticon 1\""
@@ -148,6 +173,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr ""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -156,16 +184,22 @@ msgstr " Você pode melhorar suas habilidades, aumentando o nível de job. Cada
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me text - envia um texto para um jogador o comando /me no irc. "
 
+msgid "\"Chat window\""
+msgstr "\"Janela de bate-papo\""
+
 msgid "\"Emote shortcut 10\""
 msgstr ""
 
 msgid "\"Item shortcut 14\""
 msgstr ""
 
+msgid "\"Ignore input 1\""
+msgstr "\"Ignorar input 1\""
+
 msgid "Mana Contributors"
 msgstr "Contribuidores Mana"
 
-msgid "\"Change map view mode\""
+msgid "Content devs"
 msgstr ""
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
@@ -188,6 +222,12 @@ msgstr ""
 msgid "Debug"
 msgstr "Depurador"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr ""
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack NAME - adiciona monstro na lista de ataque."
 
@@ -213,7 +253,7 @@ msgstr ""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - Seleciona o contador de jogadas requisitadas."
 
-msgid "\"Quit\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
 msgstr ""
 
 msgid "/outfit N - wear outfit number N."
@@ -234,8 +274,8 @@ msgstr ""
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - curar o NICK."
 
-msgid "Contributors to client development"
-msgstr "Contribuidores para o desenvolvimento do cliente. "
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr ""
@@ -246,8 +286,8 @@ msgstr "/removeattack NAME - remover o monstro da lista de atques."
 msgid "\"Set direction up\""
 msgstr ""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - imprimir a posição atual do jogador."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr ""
@@ -257,7 +297,7 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr ""
 
-msgid "/exp - show party experience sharing options."
+msgid "\"Kills stats window\""
 msgstr ""
 
 msgid ""
@@ -265,10 +305,11 @@ msgid ""
 "##2?text"
 msgstr ""
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Você pode comprar ou vender itens em lojas de jogadores. Botão direito do mouse no player e selecione \"Comprar\" ou \"Vender\""
+msgid "\"Change move to target type\""
+msgstr ""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr ""
@@ -288,8 +329,8 @@ msgstr ""
 msgid "IGNORING COMMUNICATION"
 msgstr "IGNORANDO COMUNICAÇÃO"
 
-msgid "WINDOWS"
-msgstr "JANELAS"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "SUPORTE"
@@ -334,6 +375,15 @@ msgstr "Você pode restaurar as configurações da barra amarela clicando com o
 msgid "/who - print online players number to chat."
 msgstr "/who - imprime o número de pessoas online no chat"
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway MSG - habilita/desabilita o falso modo ausente."
+
+msgid "Sources:"
+msgstr ""
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - mostra o tempo do cliente ativo."
 
@@ -358,8 +408,10 @@ msgstr "/imitation NICK - Começa o modo de imitação."
 msgid "\"Outfit shortcut 5\""
 msgstr ""
 
-msgid "KEYBOARD:"
-msgstr "TECLADO:"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Você pode imitar outros jogadores selecionando a opção \"imitar\" no menu ou digitar o comando: /imitate nomedojogador"
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -371,12 +423,15 @@ msgstr ""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr "Notícias do servidor"
+msgid "Contributors to client development"
+msgstr "Contribuidores para o desenvolvimento do cliente. "
 
 msgid "\"Outfit shortcut 11\""
 msgstr ""
 
+msgid "\"Move right\""
+msgstr ""
+
 msgid "\"Item shortcut 11\""
 msgstr ""
 
@@ -400,8 +455,11 @@ msgstr ""
 msgid "\"Move to target\""
 msgstr ""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway MSG - habilita/desabilita o falso modo ausente."
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr ""
@@ -424,8 +482,8 @@ msgstr "/ignoreall - adiciona todos sussurros a lista de ignorados."
 msgid "\"Copy outfit\""
 msgstr ""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr ""
+msgid "Server news"
+msgstr "Notícias do servidor"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NICK - adiciona NICK a lista de ignorados."
@@ -436,14 +494,11 @@ msgstr ""
 msgid "\"Disable / enable game modifier keys\""
 msgstr ""
 
-msgid "Other contributors"
-msgstr "Outros contribuidores"
+msgid "\"Change crazy Move mode\""
+msgstr ""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "A comunicação muitas vezes essencial para o sucesso neste jogo. Você pode se comunicar de várias maneiras: Conversando e mostrando emoções (veja acima), por negociação (com o menu do botão direito), e sussurrando."
+msgid "/where - print current player position to chat."
+msgstr "/where - imprimir a posição atual do jogador."
 
 msgid "\"Attack\""
 msgstr ""
@@ -451,7 +506,7 @@ msgstr ""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - vestir as próximas roupas."
 
-msgid "\"Move right\""
+msgid "/magicattack - attack target with magic."
 msgstr ""
 
 msgid ""
@@ -480,8 +535,8 @@ msgstr "/addignoreattack NAME - Adicionar um monstro para lista de ignorados."
 msgid "Android porting"
 msgstr ""
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - Limpa a aba atual de Bate-Papo."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr ""
@@ -504,6 +559,9 @@ msgstr "Troca"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist NICK - adiciona o NICK a lista negra de relações."
 
+msgid "\"Change map view mode\""
+msgstr ""
+
 msgid "\"Close chat tab\""
 msgstr ""
 
@@ -519,6 +577,9 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+msgid "Other linux:"
+msgstr ""
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -530,13 +591,16 @@ msgstr ""
 msgid "\"Target player\""
 msgstr ""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr ""
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -548,12 +612,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr ""
 
-msgid "\"Next chat tab\""
+msgid "/uploadlog - upload log into pastebin service."
 msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "Contribuidores do ManaPlus:"
 
+msgid "\"Emote shortcut 5\""
+msgstr ""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr ""
 
@@ -563,8 +630,10 @@ msgstr "Habilidades básicas:"
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr ""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Você pode comprar ou vender itens em lojas de jogadores. Botão direito do mouse no player e selecione \"Comprar\" ou \"Vender\""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase NICK - adiciona NICK para a lista apagada."
@@ -591,6 +660,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr ""
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend NICK, /befriend NICK - adiciona o NICK a lista de amigos."
 
@@ -646,15 +719,21 @@ msgid ""
 "nick."
 msgstr "/msg NOME texto, /whisper NOME texto, /w NOME texto - envia mensagem privada para o nome."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr ""
 
-msgid "\"Item shortcut 1\""
+msgid "/open URL - open url in browser."
 msgstr ""
 
 msgid "Commands"
 msgstr "Comandos"
 
+msgid "WINDOWS"
+msgstr "JANELAS"
+
 msgid "\"Outfit shortcut 9\""
 msgstr ""
 
@@ -669,7 +748,10 @@ msgid ""
 " of the following:"
 msgstr " A lista de jogadores mostra todos os seus conhecidos.  Eles são\ncategorizados como um dos seguintes:"
 
-msgid "\"Change attack weapon type\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
 msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
@@ -678,6 +760,9 @@ msgstr "/outfit prev - veste a roupa anterior."
 msgid "\"Crazy moves\""
 msgstr ""
 
+msgid "Powered By"
+msgstr "Mantido por"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -699,7 +784,7 @@ msgstr ""
 msgid "\"Set direction right\""
 msgstr ""
 
-msgid "\"Move to home location\""
+msgid "/announce MESSAGE - show global message."
 msgstr ""
 
 msgid "Player relations"
@@ -734,17 +819,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr ""
 
-msgid "\"Kills stats window\""
+msgid "\"Move to home location\""
 msgstr ""
 
 msgid "\"Toggle chat\""
 msgstr ""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr ""
 
-msgid "Manaplus Developers"
-msgstr "Desenvolvedores do Manaplus"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - Limpa a aba atual de Bate-Papo."
 
 msgid "\"On / off audio\""
 msgstr ""
@@ -761,8 +849,8 @@ msgstr "Você pode mudar qualquer tecla nas configurações de teclado."
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - mostra diretório do cliente na aba \"Depurador\" do bate-papo."
 
-msgid "Powered By"
-msgstr "Mantido por"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - desconexão rápida do servidor."
@@ -779,12 +867,15 @@ msgstr ""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/disregard NICK - adiciona um nick à lista de ignorados."
 
-msgid "\"Change crazy Move mode\""
+msgid "\"Item shortcut 1\""
 msgstr ""
 
 msgid "\"Outfit shortcut 8\""
 msgstr ""
 
+msgid "Manaplus Developers"
+msgstr "Desenvolvedores do Manaplus"
+
 msgid "\"Change imitation mode\""
 msgstr ""
 
@@ -796,12 +887,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr ""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress NICK - remove all clothes from nick. Local effect only."
 
+msgid "Other"
+msgstr ""
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -810,10 +907,13 @@ msgstr "Caso contrário, veja a seção da @@team|Equipe de Desenvolvimento@@ pa
 msgid "\"Outfit shortcut 14\""
 msgstr ""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr ""
 
-msgid "\"Switch pvp attack\""
+msgid "/enablehighlight - enable highlight in current tab."
 msgstr ""
 
 msgid "\"Emote shortcut window\""
@@ -822,17 +922,26 @@ msgstr ""
 msgid "\"Bot checker window\""
 msgstr ""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr ""
 
+msgid "DOWNLOADS"
+msgstr ""
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr ""
 
 msgid "About The Mana World"
 msgstr "Sobre o The Mana World"
 
-msgid "\"Emote shortcut 5\""
+msgid "/testparticle FILENAME - set test particle on player."
 msgstr ""
 
 msgid "\"Smilie\""
@@ -857,7 +966,7 @@ msgstr ""
 msgid "Whispers"
 msgstr "Sussurros"
 
-msgid "Search string not found."
+msgid "/url URL - insert url into chat."
 msgstr ""
 
 msgid "\"Wear outfit\""
@@ -901,6 +1010,9 @@ msgstr ""
 msgid "About"
 msgstr "Sobre"
 
+msgid "\"Change attack weapon type\""
+msgstr ""
+
 msgid "\"Emote shortcut 12\""
 msgstr ""
 
@@ -960,6 +1072,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr ""
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr ""
 
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 2e6857644..5e1fbc72e 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -1,7 +1,7 @@
 # en#
 # Translators:
 # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2012
-# Andrei Karas <akaras@inbox.ru>, 2012-2013
+# Andrei Karas <akaras@inbox.ru>, 2012-2014
 # BoBaH <BoBaH4spam@ukr.net>, 2012
 # Dan Sagunov <danilka.pro@gmail.com>, 2012-2013
 # RatreX <ratrex@mail.ru>, 2013
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-13 09:02+0000\n"
+"PO-Revision-Date: 2014-02-28 19:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,14 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgid "/item 0 - disable party item sharing options."
+msgid "/invite NICK - invite a player to your party."
 msgstr ""
 
-msgid "\"Outfit shortcut 12\""
-msgstr "\"Наряд 12\""
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
+msgstr "\"Переключение pvp атаки\""
 
 msgid "To read about whispering and other chat commands, look here:"
 msgstr "Чтобы узнать о привате (шепоте, whisper) и других\nкомандах чата, загляните сюда:"
@@ -40,11 +43,8 @@ msgstr "Вы можете выбрать другое оформление.\n О
 msgid "\"Target & attack\""
 msgstr "\"Прицел и атака\""
 
-msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr " Большинство команд работает в привате.\nНапример, команда /imitation в привате с ИГРОК1,\nравнозначна команде /imitation ИГРОК1 в общем чате"
+msgid "/atkhuman - select and attack nearest player."
+msgstr ""
 
 msgid "\"Emote shortcut 11\""
 msgstr "\"Смайл 11\""
@@ -57,19 +57,20 @@ msgid ""
 " window and drop them."
 msgstr " Чтобы добавить предмет на панель ярлыков, щелкните по предмету в окне снаряжения,\n затем щелкните в ячейке на панели ярлыков, в которой вы хотите закрепить предмет.\n Чтобы переназначить предметы на панели ярлыков, просто щелкните и тащите их между ячейками. Чтобы убрать предмет, просто перетащите его за пределы границы панели ярлыков\n и отпустите."
 
-msgid "\"Ignore input 1\""
-msgstr "\"Игнорирование ввода 1\""
+msgid "\"Outfit shortcut 12\""
+msgstr "\"Наряд 12\""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - показать содержимое текстового буфера."
 
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
 msgid "\"Outfits window\""
 msgstr "\"Окно нарядов\""
 
-msgid ""
-"You can imitate other players by selecting \"imitation\" in player context menu\n"
-" or type chat command: /imitate playername."
-msgstr "Вы можете имитировать других игроков, выбрав \"Имитация\" в контекстном меню игрока, или с помощью команды: /imitation ИГРОК"
+msgid "KEYBOARD:"
+msgstr "КЛАВИАТУРА:"
 
 msgid ""
 " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
@@ -85,6 +86,9 @@ msgstr ""
 msgid "\"Set direction down\""
 msgstr "\"Установить направление вниз\""
 
+msgid "GM"
+msgstr "ГМ"
+
 msgid "\"Target NPC\""
 msgstr "\"Выбрать NPC\""
 
@@ -100,8 +104,8 @@ msgid ""
 "then click on warp what you want."
 msgstr "Вы можете двигаться к Вратам автоматически. Откройте окно \"Общество\" (F11) и выберите вкладку \"Нав\" (Навигация), затем кликните на название требуемых Врат."
 
-msgid "\"Chat window\""
-msgstr "\"Окно чата\""
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral ИГРОК - добавить игрока в нейтральный список."
@@ -115,8 +119,8 @@ msgstr "/addpriorityattack МОНСТР - добавить монстра в п�
 msgid "Back to Index"
 msgstr "Назад к содержанию"
 
-msgid "DOWNLOADS"
-msgstr "ЗАГРУЗКИ"
+msgid "\"Quit\""
+msgstr "\"Выход\""
 
 msgid "THE PLAYER LIST"
 msgstr "СПИСОК ИГРОКОВ"
@@ -124,22 +128,43 @@ msgstr "СПИСОК ИГРОКОВ"
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - загружает список цен с диска."
 
+msgid "Search string not found."
+msgstr "Искомоя строка не найдена"
+
 msgid "\"Quests window\""
 msgstr "\"Окно заданий\""
 
+msgid "Other contributors"
+msgstr "Другие участники"
+
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
 msgstr "Желтую панель можно выключить, нажав 8 на цифровой клавиатуре."
 
+msgid "\"Next chat tab\""
+msgstr "\"Следующая закладка чата\""
+
+msgid "Support"
+msgstr "Поддержка"
+
 msgid "\"Quick drop window\""
 msgstr "\"Окно быстрого сброса предметов\""
 
 msgid "\"Screenshot\""
 msgstr "\"Снимок экрана\""
 
-msgid "Support"
-msgstr "Поддержка"
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr " Большинство команд работает в привате.\nНапример, команда /imitation в привате с ИГРОК1,\nравнозначна команде /imitation ИГРОК1 в общем чате"
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "Взаимодействие с другими игроками часто необходимо в этой игре. Вы можете взаимодействовать несколькими путями:\nПутем чата (см. выше) и эмоциями, торговли\n (с помощью контекстного меню), и шепота."
 
 msgid "\"Emote shortcut 1\""
 msgstr "\"Смайл 1\""
@@ -152,6 +177,9 @@ msgstr ""
 msgid "\"Outfit shortcut 13\""
 msgstr "\"Наряд 13\""
 
+msgid "/sethome - set home position."
+msgstr ""
+
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
@@ -160,17 +188,23 @@ msgstr " Можно совершенствовать свои навыки, ув
 msgid "/me text - send text to chat as /me command in irc."
 msgstr "/me текст - отправить текст в чат как командой /me в IRC"
 
+msgid "\"Chat window\""
+msgstr "\"Окно чата\""
+
 msgid "\"Emote shortcut 10\""
 msgstr "\"Смайл 10\""
 
 msgid "\"Item shortcut 14\""
 msgstr "\"Горячая клавиша предмета 14\""
 
+msgid "\"Ignore input 1\""
+msgstr "\"Игнорирование ввода 1\""
+
 msgid "Mana Contributors"
 msgstr "В разработке Mana принимали участие"
 
-msgid "\"Change map view mode\""
-msgstr "\"Изменение режима отображения карты\""
+msgid "Content devs"
+msgstr "Разработчики контента"
 
 msgid "/query NICK, /q NICK - open new whisper tab for nick."
 msgstr "/query ИГРОК, /q ИГРОК - открыть новую вкладку для шепота с игроком."
@@ -192,6 +226,12 @@ msgstr "\"Смайл 7\""
 msgid "Debug"
 msgstr "Отладка"
 
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr "Интернет сайт: @@http://manaplus.org/|http://manaplus.org/@@"
+
 msgid "/addattack NAME - add monster to attack list."
 msgstr "/addattack МОНСТР - добавить монстра в список атаки."
 
@@ -217,8 +257,8 @@ msgstr "\"Наряд 6\""
 msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - задать счетчику дропов нужное значение."
 
-msgid "\"Quit\""
-msgstr "\"Выход\""
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr ""
 
 msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - одевает наряд номер N."
@@ -238,8 +278,8 @@ msgstr "\"Движение вниз\""
 msgid "/heal NICK - heal nick."
 msgstr "/heal ИГРОК - лечить игрока."
 
-msgid "Contributors to client development"
-msgstr "В разработке клиентской части принимали участие"
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
 
 msgid "\"Setup window\""
 msgstr "\"Окно настроек\""
@@ -250,8 +290,8 @@ msgstr "/removeattack МОНСТР - удалить монстра из спис
 msgid "\"Set direction up\""
 msgstr "\"Установить направление вверх\""
 
-msgid "/where - print current player position to chat."
-msgstr "/where - вывести текущее положение игрока в чат."
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
 
 msgid "Instructions"
 msgstr "Инструкции"
@@ -261,18 +301,19 @@ msgid ""
 "by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 msgstr "Если клиент работает очень медленно, вы можете увеличить скорость\nпрочитав материал по ссылке: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
 
-msgid "/exp - show party experience sharing options."
-msgstr ""
+msgid "\"Kills stats window\""
+msgstr "\"Окно статистики атак\""
 
 msgid ""
 "You can do basic searching in help by using command\n"
 "##2?text"
 msgstr "Вы можете использовать простой поиск по справке используя команду\n##2?текст"
 
-msgid ""
-"You can buy or sell items from players shops.\n"
-"Right click on player and select \"Buy\" or \"Sell\""
-msgstr "Вы можете покупать и продавать предметы\nв пользовательский маназинах.\nНажмите правой кнопкой на пользователе\nи выберите \"Купить\" или \"Продать\""
+msgid "\"Change move to target type\""
+msgstr "\"Изменение типа движения к цели\""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
 
 msgid "\"Enable/disable trading\""
 msgstr "\"Разрешение/Запрет торговли\""
@@ -292,8 +333,8 @@ msgstr " По любым вопросам об игре в первую очер
 msgid "IGNORING COMMUNICATION"
 msgstr "ИГНОРИРОВАНИЕ"
 
-msgid "WINDOWS"
-msgstr "ОКНА"
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
 
 msgid "SUPPORT"
 msgstr "ПОДДЕРЖКА"
@@ -338,6 +379,15 @@ msgstr "Вы можете сбросить настройки Желтой па�
 msgid "/who - print online players number to chat."
 msgstr "/who - вывести количество пользователей онлайн в чат."
 
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr "/pseudoaway, /pseudoaway ТЕКСТ - включить/выключить режим псевдо-\"Отошел\"."
+
+msgid "Sources:"
+msgstr "Исходники:"
+
 msgid "/uptime - show client uptime."
 msgstr "/uptime - показать время работы клиента."
 
@@ -362,8 +412,10 @@ msgstr "/imitation ИГРОК - начать режим имитации."
 msgid "\"Outfit shortcut 5\""
 msgstr "\"Наряд 5\""
 
-msgid "KEYBOARD:"
-msgstr "КЛАВИАТУРА:"
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "Вы можете имитировать других игроков, выбрав \"Имитация\" в контекстном меню игрока, или с помощью команды: /imitation ИГРОК"
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -375,12 +427,15 @@ msgstr "\"Прокручивание чата вниз\""
 msgid "##2Trade:##9 enables the ability to trade with others."
 msgstr ""
 
-msgid "Server news"
-msgstr "Новости сервера"
+msgid "Contributors to client development"
+msgstr "В разработке клиентской части принимали участие"
 
 msgid "\"Outfit shortcut 11\""
 msgstr "\"Наряд 11\""
 
+msgid "\"Move right\""
+msgstr "\"Движение вправо\""
+
 msgid "\"Item shortcut 11\""
 msgstr "\"Горячая клавиша предмета 11\""
 
@@ -404,8 +459,11 @@ msgstr "Все о желтой панели вы можете прочесть �
 msgid "\"Move to target\""
 msgstr "\"Движение к цели\""
 
-msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr "/pseudoaway, /pseudoaway ТЕКСТ - включить/выключить режим псевдо-\"Отошел\"."
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
 
 msgid "\"Enable / disable away mode\""
 msgstr "\"Включение / Выключение режима отошел\""
@@ -428,8 +486,8 @@ msgstr "/ignoreall - добавить всех в список игнориро�
 msgid "\"Copy outfit\""
 msgstr "\"Копировать наряд\""
 
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Интернет сайт: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Server news"
+msgstr "Новости сервера"
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore ИГРОК - добавить игрока в список игнорирования."
@@ -440,14 +498,11 @@ msgstr "\"Горячие клавиши предметов\""
 msgid "\"Disable / enable game modifier keys\""
 msgstr "\"Включение / Выключение специальных модификаторов\""
 
-msgid "Other contributors"
-msgstr "Другие участники"
+msgid "\"Change crazy Move mode\""
+msgstr "\"Изменение режима сумасшедших движений\""
 
-msgid ""
-"Communication is often essential to success in this game. You can communicate\n"
-" in several ways:  By chatting and showing emotions (see above), by trading\n"
-" (with the right-click context menu), and by whispering."
-msgstr "Взаимодействие с другими игроками часто необходимо в этой игре. Вы можете взаимодействовать несколькими путями:\nПутем чата (см. выше) и эмоциями, торговли\n (с помощью контекстного меню), и шепота."
+msgid "/where - print current player position to chat."
+msgstr "/where - вывести текущее положение игрока в чат."
 
 msgid "\"Attack\""
 msgstr "\"Атака\""
@@ -455,8 +510,8 @@ msgstr "\"Атака\""
 msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - надеть следующий костюм."
 
-msgid "\"Move right\""
-msgstr "\"Движение вправо\""
+msgid "/magicattack - attack target with magic."
+msgstr ""
 
 msgid ""
 "You can set away mode,\n"
@@ -484,8 +539,8 @@ msgstr "/addignoreattack МОНСТР - добавить монстра в сп�
 msgid "Android porting"
 msgstr "Портирование на Android"
 
-msgid "/clear - clear current chat tab."
-msgstr "/clear - очистить текущую вкладку чата."
+msgid "Tabs"
+msgstr ""
 
 msgid "\"Social window\""
 msgstr "\"Окно общества\""
@@ -508,6 +563,9 @@ msgstr "Обмен"
 msgid "/blacklist NICK - add nick to blacklist relation list."
 msgstr "/blacklist ИГРОК - добавить игрока в черный список."
 
+msgid "\"Change map view mode\""
+msgstr "\"Изменение режима отображения карты\""
+
 msgid "\"Close chat tab\""
 msgstr "\"Закрыть вкладку чата\""
 
@@ -523,6 +581,9 @@ msgstr ""
 msgid "Download"
 msgstr "Скачать"
 
+msgid "Other linux:"
+msgstr "Другие linux'ы:"
+
 msgid ""
 " - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
 "   message your in private, or trade with you at any point."
@@ -534,13 +595,16 @@ msgstr "Художники"
 msgid "\"Target player\""
 msgstr "\"Выбор игрока\""
 
-msgid "/invite NICK - invite a player to your party."
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
 msgstr ""
 
 msgid "##2ManaPlus version: ##6%VER%"
 msgstr "##2версия ManaPlus : ##6%VER%"
 
-msgid "/exp 0 - disable party experience sharing options."
+msgid "/enemy NICK - add nick to enemyes list."
 msgstr ""
 
 msgid ""
@@ -552,12 +616,15 @@ msgstr ""
 msgid "\"Debug window\""
 msgstr "\"Окно отладки\""
 
-msgid "\"Next chat tab\""
-msgstr "\"Следующая закладка чата\""
+msgid "/uploadlog - upload log into pastebin service."
+msgstr ""
 
 msgid "ManaPlus Contributors"
 msgstr "Разработчики ManaPlus"
 
+msgid "\"Emote shortcut 5\""
+msgstr "\"Смайл 5\""
+
 msgid "\"Copy equiped to Outfit\""
 msgstr "\"Надетое в наряд\""
 
@@ -567,8 +634,10 @@ msgstr "Основные умения:"
 msgid "/leave - leave the party you are in."
 msgstr ""
 
-msgid "\"Change move to target type\""
-msgstr "\"Изменение типа движения к цели\""
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr "Вы можете покупать и продавать предметы\nв пользовательский маназинах.\nНажмите правой кнопкой на пользователе\nи выберите \"Купить\" или \"Продать\""
 
 msgid "/erase NICK - add nick to erased list."
 msgstr "/erase ИГРОК - добавить игрока в список стертых."
@@ -595,6 +664,10 @@ msgid ""
 "##2                            zlib (Archives)"
 msgstr "##2 SDL, SDL_image, SDL_mixer (Медиа фрэймворк)\n##2 SDL_net (Сетевой фрэймворк)\n##2 Guichan (Графический фреймворк)\n##2 libxml2 (XML парсинг и запись)\n##2 PhysFS (Файлы данных)\n##2 libcurl (HTTP загрузки)\n##2 zlib (Архивы)"
 
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend ИГРОК, /befriend ИГРОК - добавить игрока в список друзей."
 
@@ -650,15 +723,21 @@ msgid ""
 "nick."
 msgstr "/msg ИГРОК текст, /whisper ИГРОК текст, /w ИГРОК текст - шептать игроку."
 
+msgid "/movetotarget - move to target position."
+msgstr ""
+
 msgid "\"Emote shortcut 14\""
 msgstr "\"Смайл 14\""
 
-msgid "\"Item shortcut 1\""
-msgstr "\"Горячая клавиша предмета 1\""
+msgid "/open URL - open url in browser."
+msgstr ""
 
 msgid "Commands"
 msgstr "Команды"
 
+msgid "WINDOWS"
+msgstr "ОКНА"
+
 msgid "\"Outfit shortcut 9\""
 msgstr "\"Наряд 9\""
 
@@ -673,8 +752,11 @@ msgid ""
 " of the following:"
 msgstr " Список игрока отображает все ваши знакомства.  Они классифицируются как один\n из следующих:"
 
-msgid "\"Change attack weapon type\""
-msgstr "\"Изменение типа атаки оружием\""
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr ""
 
 msgid "/outfit prev - wear previous outfit."
 msgstr "/outfit prev - надеть предыдущий костюм."
@@ -682,6 +764,9 @@ msgstr "/outfit prev - надеть предыдущий костюм."
 msgid "\"Crazy moves\""
 msgstr "\"Сумасшедшие движения\""
 
+msgid "Powered By"
+msgstr "Сделано при помощи"
+
 msgid "##2Party level2:##9 enables a char to create a party."
 msgstr ""
 
@@ -703,8 +788,8 @@ msgstr "\"Следующая строка вкладки чата\""
 msgid "\"Set direction right\""
 msgstr "\"Установить направление вправо\""
 
-msgid "\"Move to home location\""
-msgstr "\"Переход к Домашней локации\""
+msgid "/announce MESSAGE - show global message."
+msgstr ""
 
 msgid "Player relations"
 msgstr "Отношения между игроками"
@@ -738,17 +823,20 @@ msgstr ""
 msgid "\"Skill window\""
 msgstr "\"Окно навыков\""
 
-msgid "\"Kills stats window\""
-msgstr "\"Окно статистики атак\""
+msgid "\"Move to home location\""
+msgstr "\"Переход к Домашней локации\""
 
 msgid "\"Toggle chat\""
 msgstr "\"Переключение на чат\""
 
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
 msgid "\"Change attack type\""
 msgstr "\"Изменение типа атаки\""
 
-msgid "Manaplus Developers"
-msgstr "Разработчики Manaplus"
+msgid "/clear - clear current chat tab."
+msgstr "/clear - очистить текущую вкладку чата."
 
 msgid "\"On / off audio\""
 msgstr "\"Вкл. / Выкл. звука\""
@@ -765,8 +853,8 @@ msgstr "Вы можете изменить любую клавишу в наст
 msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - показывает расположение директорий вотладочном окне."
 
-msgid "Powered By"
-msgstr "Сделано при помощи"
+msgid "/movetohome - move to home position."
+msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - быстро отключиться от сервера."
@@ -783,12 +871,15 @@ msgstr "\"Смайл 13\""
 msgid "/disregard NICK - add nick to disregarded list."
 msgstr "/disregard NICK - добавляет NICK в список нехороших ников."
 
-msgid "\"Change crazy Move mode\""
-msgstr "\"Изменение режима сумасшедших движений\""
+msgid "\"Item shortcut 1\""
+msgstr "\"Горячая клавиша предмета 1\""
 
 msgid "\"Outfit shortcut 8\""
 msgstr "\"Наряд 8\""
 
+msgid "Manaplus Developers"
+msgstr "Разработчики Manaplus"
+
 msgid "\"Change imitation mode\""
 msgstr "\"Изменение режима имитации\""
 
@@ -800,12 +891,18 @@ msgstr ""
 msgid "##9Other skills can be obtain by doing quests and missions in game."
 msgstr ""
 
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
 msgid "\"Reset video mode to safe value\""
 msgstr "\"Сброс режима видео на безопасное значение\""
 
 msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr "/undress NICK - снять всю одежду с NICK. Только местное действие."
 
+msgid "Other"
+msgstr "Другое"
+
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
@@ -814,11 +911,14 @@ msgstr " В противном случае смотрите секцию @@ко
 msgid "\"Outfit shortcut 14\""
 msgstr "\"Наряд 14\""
 
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
 msgid "\"Quick drop N items from 0 slot\""
 msgstr "\"Быстрый сброс N предметов из 0 слота\""
 
-msgid "\"Switch pvp attack\""
-msgstr "\"Переключение pvp атаки\""
+msgid "/enablehighlight - enable highlight in current tab."
+msgstr ""
 
 msgid "\"Emote shortcut window\""
 msgstr "\"Окно смайлов\""
@@ -826,18 +926,27 @@ msgstr "\"Окно смайлов\""
 msgid "\"Bot checker window\""
 msgstr "\"Окно детектора ботов\""
 
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
 msgstr "/mail НИК СООБЩЕНИЕ - послать оффлайн сообщение игроку НИК. Работает только на tmw серверах."
 
+msgid "DOWNLOADS"
+msgstr "ЗАГРУЗКИ"
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
 msgid "\"Item shortcut 15\""
 msgstr "\"Горячая клавиша предмета 15\""
 
 msgid "About The Mana World"
 msgstr "О The Mana World"
 
-msgid "\"Emote shortcut 5\""
-msgstr "\"Смайл 5\""
+msgid "/testparticle FILENAME - set test particle on player."
+msgstr ""
 
 msgid "\"Smilie\""
 msgstr "\"Смайлы\""
@@ -861,8 +970,8 @@ msgstr "Вы можете видеть экипировку других игр�
 msgid "Whispers"
 msgstr "Приват (шепот, whisper)"
 
-msgid "Search string not found."
-msgstr "Искомоя строка не найдена"
+msgid "/url URL - insert url into chat."
+msgstr ""
 
 msgid "\"Wear outfit\""
 msgstr "\"Надеть наряд\""
@@ -905,6 +1014,9 @@ msgstr "Вы можете обнаружить, что не всё общени�
 msgid "About"
 msgstr "Об игре"
 
+msgid "\"Change attack weapon type\""
+msgstr "\"Изменение типа атаки оружием\""
+
 msgid "\"Emote shortcut 12\""
 msgstr "\"Смайл 12\""
 
@@ -964,6 +1076,9 @@ msgid ""
 " menu, select `Setup' in the upper right corner of the screen, then `Relations'."
 msgstr "Впрочем, вы можете защититься от таких игроков, игнорируя их. Правым-⏎ кликом на игроке откройте контекстное меню, затем выберите `Игнорировать' или⏎ `Пренебречь' (см. выше). Вы можете настраивать отношения с игроками в меню ⏎ `Настройка', которое показывает всех игроков, добавленных туда. Чтобы открыть это⏎ меню, выберите `Настройка' в правом верхнем углу экрана, затем `Игроки'."
 
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
 msgid "Different patches"
 msgstr "Различные патчи"
 
diff --git a/data/translations/help/zh_CN.po b/data/translations/help/zh_CN.po
new file mode 100644
index 000000000..6da157f39
--- /dev/null
+++ b/data/translations/help/zh_CN.po
@@ -0,0 +1,1123 @@
+# en#
+# Translators:
+# Midoni <qiuhongwen@gmail.com>, 2012
+# yudun1989 <yudun1989@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ManaPlus\n"
+"PO-Revision-Date: 2014-02-28 18:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "/invite NICK - invite a player to your party."
+msgstr ""
+
+msgid "/uploadserverconfig - upload server config into pastebin service."
+msgstr ""
+
+msgid "\"Switch pvp attack\""
+msgstr ""
+
+msgid "To read about whispering and other chat commands, look here:"
+msgstr "关于私信以及其他聊天命令请看这里："
+
+msgid "/away, /away MSG - set away mode."
+msgstr ""
+
+msgid ""
+"You can select other themes.\n"
+"For this you should open settings and select theme tab\n"
+"and change \"gui theme\""
+msgstr ""
+
+msgid "\"Target & attack\""
+msgstr ""
+
+msgid "/atkhuman - select and attack nearest player."
+msgstr ""
+
+msgid "\"Emote shortcut 11\""
+msgstr ""
+
+msgid ""
+" To add an item to the shortcut bar click on the item in the inventory window,\n"
+" then click on the box in the shortcut-window which should be associated with\n"
+" the item. To reorder items within the shortcut-window simply click and drag\n"
+" them between the boxes. To remove items you simply drag them outside of the\n"
+" window and drop them."
+msgstr ""
+
+msgid "\"Outfit shortcut 12\""
+msgstr ""
+
+msgid "/cacheinfo - show text cache info."
+msgstr "/cacheinfo —— 显示文本缓存信息。"
+
+msgid "/exp 0 - disable party experience sharing options."
+msgstr ""
+
+msgid "\"Outfits window\""
+msgstr ""
+
+msgid "KEYBOARD:"
+msgstr "键盘："
+
+msgid ""
+" - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n"
+"   players?"
+msgstr ""
+
+msgid "\"Emote shortcut 9\""
+msgstr ""
+
+msgid "/item 1 - enable party item sharing options."
+msgstr ""
+
+msgid "\"Set direction down\""
+msgstr ""
+
+msgid "GM"
+msgstr ""
+
+msgid "\"Target NPC\""
+msgstr ""
+
+msgid "Party chat commands"
+msgstr ""
+
+msgid "/help - show this help."
+msgstr ""
+
+msgid ""
+"You can walk to warps automatically.\n"
+"Open Social Window (###keyWindowSocial;) and selecy Nav tab,\n"
+"then click on warp what you want."
+msgstr ""
+
+msgid "/info - show guild info. Only for native guilds only."
+msgstr ""
+
+msgid "/neutral NICK - add nick to neutral relation list."
+msgstr "/neutral 昵称 —— 将昵称加入中立列表。"
+
+msgid "\"Outfit shortcut 7\""
+msgstr ""
+
+msgid "/addpriorityattack NAME - add monster to priority attack list."
+msgstr "/addpriorityattack 名称 —— 将怪兽加入优先攻击列表。"
+
+msgid "Back to Index"
+msgstr "退回到索引"
+
+msgid "\"Quit\""
+msgstr ""
+
+msgid "THE PLAYER LIST"
+msgstr "玩家列表"
+
+msgid "/priceload - load shop price from disc."
+msgstr "/priceload —— 从磁盘加载商店价格。"
+
+msgid "Search string not found."
+msgstr ""
+
+msgid "\"Quests window\""
+msgstr ""
+
+msgid "Other contributors"
+msgstr "其他贡献者"
+
+msgid ""
+"You can disable yellow bar,\n"
+"by pressing ###keyDisableGameModifiers;."
+msgstr ""
+
+msgid "\"Next chat tab\""
+msgstr ""
+
+msgid "Support"
+msgstr "支持"
+
+msgid "\"Quick drop window\""
+msgstr ""
+
+msgid "\"Screenshot\""
+msgstr ""
+
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr ""
+
+msgid ""
+"Communication is often essential to success in this game. You can communicate\n"
+" in several ways:  By chatting and showing emotions (see above), by trading\n"
+" (with the right-click context menu), and by whispering."
+msgstr "在这个游戏中交流通常是成功必需的。你可以通过多种方式交流：通过聊天和使用表情(参考上面)，通过交易(使用右键菜单)，以及使用私信。"
+
+msgid "\"Emote shortcut 1\""
+msgstr ""
+
+msgid ""
+" - ##2ignored##9:  You wish to completely ignore this player.  You will not\n"
+"   even see floating text for him or her anymore, nor emotions."
+msgstr ""
+
+msgid "\"Outfit shortcut 13\""
+msgstr ""
+
+msgid "/sethome - set home position."
+msgstr ""
+
+msgid ""
+" You can improve your skills by increasing job level. Each job level\n"
+" gives you 1 point to spend on basic skills."
+msgstr "你可以通过提升工作等级来增强你的技能。每级工作等级给你 1 点用于增强基本技能。"
+
+msgid "/me text - send text to chat as /me command in irc."
+msgstr "/me 文本 —— 将文本作为 /me 命令发送。"
+
+msgid "\"Chat window\""
+msgstr ""
+
+msgid "\"Emote shortcut 10\""
+msgstr ""
+
+msgid "\"Item shortcut 14\""
+msgstr ""
+
+msgid "\"Ignore input 1\""
+msgstr ""
+
+msgid "Mana Contributors"
+msgstr "Mana 贡献者"
+
+msgid "Content devs"
+msgstr ""
+
+msgid "/query NICK, /q NICK - open new whisper tab for nick."
+msgstr "/query 昵称，/q 昵称 —— 为昵称创建新的私信标签页。"
+
+msgid ""
+" - ##2allow whispers##9: Do you wish to allow arbitrary players to send\n"
+"   private messages to you in-game?"
+msgstr ""
+
+msgid "\"Item shortcut 5\""
+msgstr ""
+
+msgid "/all - show visible beings list in debug tab."
+msgstr "/all —— 将可见之物显于调试页。"
+
+msgid "\"Emote shortcut 7\""
+msgstr ""
+
+msgid "Debug"
+msgstr "调试"
+
+msgid "/present - print visible players number to chat."
+msgstr ""
+
+msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgstr ""
+
+msgid "/addattack NAME - add monster to attack list."
+msgstr "/addattack 名称 —— 将怪兽加入攻击列表。"
+
+msgid "For other server look servers pages for support."
+msgstr "对于其它的服务器，请查阅服务器的网页获取支持。"
+
+msgid ""
+"##2ManaPlus##9 is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr ""
+
+msgid "\"Target closest monster\""
+msgstr ""
+
+msgid "\"Emote shortcut 2\""
+msgstr ""
+
+msgid "\"Outfit shortcut 6\""
+msgstr ""
+
+msgid "/setdrop N - set drop counter to requested value."
+msgstr "/setdrop 数目 —— 将丢弃数设为指定值。"
+
+msgid "/dumpogl - dump all OpenGL variables into log file."
+msgstr ""
+
+msgid "/outfit N - wear outfit number N."
+msgstr ""
+
+msgid "Visit IRC channel:"
+msgstr "访问 IRC 频道："
+
+msgid "\"Shop window\""
+msgstr ""
+
+msgid "/createparty NAME - create party with selected name."
+msgstr "/createparty 名称 —— 创建帮会。"
+
+msgid "\"Move down\""
+msgstr ""
+
+msgid "/heal NICK - heal nick."
+msgstr "/heal 昵称 —— 治疗昵称"
+
+msgid "/emotepet N - use emotion number N from your pet."
+msgstr ""
+
+msgid "\"Setup window\""
+msgstr ""
+
+msgid "/removeattack NAME - remove monster from attack list."
+msgstr "/removeattach 名称 —— 将怪物从攻击列表移除。"
+
+msgid "\"Set direction up\""
+msgstr ""
+
+msgid "/dumpe - dump environment variables into chat."
+msgstr ""
+
+msgid "Instructions"
+msgstr ""
+
+msgid ""
+"If client working very slow, you can improve speed\n"
+"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+msgstr ""
+
+msgid "\"Kills stats window\""
+msgstr ""
+
+msgid ""
+"You can do basic searching in help by using command\n"
+"##2?text"
+msgstr ""
+
+msgid "\"Change move to target type\""
+msgstr ""
+
+msgid "/dumpmods - dump all enabled mod names into chat."
+msgstr ""
+
+msgid "\"Enable/disable trading\""
+msgstr ""
+
+msgid "\"Toggle camera mode\""
+msgstr ""
+
+msgid "/unignore NICK - Remove nick from ignore list."
+msgstr "/unignore 昵称 —— 将昵称从忽视列表移除。"
+
+msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr ""
+
+msgid "IGNORING COMMUNICATION"
+msgstr "正在忽略交流"
+
+msgid "/wait NAME - wait for nick or moster with name."
+msgstr ""
+
+msgid "SUPPORT"
+msgstr "支持"
+
+msgid "\"Outfit shortcut 10\""
+msgstr ""
+
+msgid "Look this page for help and downloads:"
+msgstr ""
+
+msgid "COMMUNICATION:"
+msgstr ""
+
+msgid "Other skills:"
+msgstr "其它技能："
+
+msgid ""
+" - ##2save player list##9: Should your acquaintance list be saved when you\n"
+"   quit the game?  If you enable this option, your list will survive when you\n"
+"   quit and re-start."
+msgstr ""
+
+msgid ""
+"You can use mumble voice chat for talking with other players.\n"
+"Start mumble before client start and enable mumble in settings."
+msgstr "你可以使用Mumble语音软件与其他玩家进行对话。\n在客户端启动之前请先启动Mumble语音软件，在设置中将Mumble支持打开。"
+
+msgid "\"Move up\""
+msgstr ""
+
+msgid "Here contributors from parent projects"
+msgstr ""
+
+msgid "\"Item shortcut 4\""
+msgstr ""
+
+msgid ""
+"You can restore yellow bar settings,\n"
+"by right click on it and select in context menu \"Reset yellow bar\"."
+msgstr "你可以通过右键点击并选择“重置黄色栏”来重置黄色栏。"
+
+msgid "/who - print online players number to chat."
+msgstr "/who —— 显示在线玩家数。"
+
+msgid "/createitems - open dialog for creating items."
+msgstr ""
+
+msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
+msgstr ""
+
+msgid "Sources:"
+msgstr ""
+
+msgid "/uptime - show client uptime."
+msgstr "/uptime —— 显示客户端在线时间。"
+
+msgid "\"Who is online window\""
+msgstr ""
+
+msgid "\"Sit\""
+msgstr ""
+
+msgid "/dumpg - dump graphics and some other settings to chat."
+msgstr "/dumpg 将图像和其他设定输出到聊天框中"
+
+msgid "\"Deactivate chat input\""
+msgstr ""
+
+msgid "/trade NICK - start trade with nick."
+msgstr "/trade 昵称 -- 与对应的人物进行交易"
+
+msgid "/imitation NICK - start imitation mode."
+msgstr "/imitation 昵称 -- 开启模仿模式"
+
+msgid "\"Outfit shortcut 5\""
+msgstr ""
+
+msgid ""
+"You can imitate other players by selecting \"imitation\" in player context menu\n"
+" or type chat command: /imitate playername."
+msgstr "你可以通过在菜单中点击\"模仿\"选项或者在聊天输入框中输入 /imitate 用户昵称来进行模仿."
+
+msgid ""
+"You can hide/show bars and buttons by right click and select menu item."
+msgstr "你可以通过右击菜单项来对菜单进行隐藏和显示."
+
+msgid "\"Scroll chat down\""
+msgstr ""
+
+msgid "##2Trade:##9 enables the ability to trade with others."
+msgstr ""
+
+msgid "Contributors to client development"
+msgstr "客户端开发贡献者"
+
+msgid "\"Outfit shortcut 11\""
+msgstr ""
+
+msgid "\"Move right\""
+msgstr ""
+
+msgid "\"Item shortcut 11\""
+msgstr ""
+
+msgid "\"Item shortcut 10\""
+msgstr ""
+
+msgid "ABOUT MANAPLUS"
+msgstr "关于 MANAPLUS"
+
+msgid "\"Select OK\""
+msgstr ""
+
+msgid "MacOSX porting"
+msgstr ""
+
+msgid ""
+"About yellow bar you can read here:\n"
+"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+msgstr ""
+
+msgid "\"Move to target\""
+msgstr ""
+
+msgid "/item 0 - disable party item sharing options."
+msgstr ""
+
+msgid "/drop - drop N items from 0 slot."
+msgstr ""
+
+msgid "\"Enable / disable away mode\""
+msgstr ""
+
+msgid "INDEX"
+msgstr "索引"
+
+msgid "\"Chat auto complete\""
+msgstr ""
+
+msgid "/kick NICK - kick someone from the party you are in."
+msgstr ""
+
+msgid "\"Commands window\""
+msgstr ""
+
+msgid "/ignoreall - add all whispers to ignore list."
+msgstr "/ignoreall --忽略所有私信"
+
+msgid "\"Copy outfit\""
+msgstr ""
+
+msgid "Server news"
+msgstr ""
+
+msgid "/ignore NICK - add nick to ignore list."
+msgstr "/ignore 昵称 -- 忽略某个人的信息"
+
+msgid "\"Item shortcuts Key\""
+msgstr ""
+
+msgid "\"Disable / enable game modifier keys\""
+msgstr ""
+
+msgid "\"Change crazy Move mode\""
+msgstr ""
+
+msgid "/where - print current player position to chat."
+msgstr "/where —— 显示玩家当前的位置。"
+
+msgid "\"Attack\""
+msgstr ""
+
+msgid "/outfit next - wear next outfit."
+msgstr ""
+
+msgid "/magicattack - attack target with magic."
+msgstr ""
+
+msgid ""
+"You can set away mode,\n"
+"by type in chat command /away"
+msgstr ""
+
+msgid "/move X Y - move to X,Y position in short distance."
+msgstr "/move X Y - 短距离内移动到 X,Y 位置"
+
+msgid "##2Party Level1:##9 enables a char to join a party."
+msgstr ""
+
+msgid "\"Item shortcut 3\""
+msgstr ""
+
+msgid "\"Change move type\""
+msgstr ""
+
+msgid "Magic skills:"
+msgstr "魔法技能:"
+
+msgid "/addignoreattack NAME - add monster to ignore attack list."
+msgstr "/addignoreattact 怪物名称 - 将怪物加入到非攻击列表中"
+
+msgid "Android porting"
+msgstr ""
+
+msgid "Tabs"
+msgstr ""
+
+msgid "\"Social window\""
+msgstr ""
+
+msgid "\"Hide windows\""
+msgstr ""
+
+msgid "\"Outfit shortcut 4\""
+msgstr ""
+
+msgid "Chat commands"
+msgstr "聊天命令"
+
+msgid "\"Did you know window\""
+msgstr ""
+
+msgid "Trade"
+msgstr "交易"
+
+msgid "/blacklist NICK - add nick to blacklist relation list."
+msgstr "/blacklist 昵称 - 将昵称加入到黑名单列表。"
+
+msgid "\"Change map view mode\""
+msgstr ""
+
+msgid "\"Close chat tab\""
+msgstr ""
+
+msgid "\"Item shortcut 6\""
+msgstr ""
+
+msgid ""
+" - ##2neutral##9:  As far as the game is concerned, this is the same as not\n"
+"   having the player listed:  the player may chat with you, but may only trade\n"
+"   or whisper if you have this option allowed for everyone."
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Other linux:"
+msgstr ""
+
+msgid ""
+" - ##2friend##9:  You consider this player a friend.  The player may chat,\n"
+"   message your in private, or trade with you at any point."
+msgstr ""
+
+msgid "Art or images contributors"
+msgstr ""
+
+msgid "\"Target player\""
+msgstr ""
+
+msgid "/dropn - drop N items from any slot."
+msgstr ""
+
+msgid "/enableaway - enable away messages in current tab."
+msgstr ""
+
+msgid "##2ManaPlus version: ##6%VER%"
+msgstr ""
+
+msgid "/enemy NICK - add nick to enemyes list."
+msgstr ""
+
+msgid ""
+" - ##2disregarded##9:  You wish to disregard this player, meaning that his or\n"
+"   her chat messages are not logged and trade requests and whispers are\n"
+"   ignored."
+msgstr ""
+
+msgid "\"Debug window\""
+msgstr ""
+
+msgid "/uploadlog - upload log into pastebin service."
+msgstr ""
+
+msgid "ManaPlus Contributors"
+msgstr "ManaPlus 贡献者"
+
+msgid "\"Emote shortcut 5\""
+msgstr ""
+
+msgid "\"Copy equiped to Outfit\""
+msgstr ""
+
+msgid "Basic skills:"
+msgstr "基本技能:"
+
+msgid "/leave - leave the party you are in."
+msgstr ""
+
+msgid ""
+"You can buy or sell items from players shops.\n"
+"Right click on player and select \"Buy\" or \"Sell\""
+msgstr ""
+
+msgid "/erase NICK - add nick to erased list."
+msgstr ""
+
+msgid "/pricesave - save shop price to disc."
+msgstr ""
+
+msgid "\"Pickup\""
+msgstr ""
+
+msgid "\"Status window\""
+msgstr ""
+
+msgid "\"Item shortcut 2\""
+msgstr ""
+
+msgid ""
+"##2               SDL, SDL_image, SDL_mixer (Media framework)\n"
+"##2                     SDL_net (Networking framework)\n"
+"##2                        Guichan (GUI framework)\n"
+"##2                   libxml2 (XML parsing and writing)\n"
+"##2                          PhysFS (Data files)\n"
+"##2                        libcurl (HTTP downloads)\n"
+"##2                            zlib (Archives)"
+msgstr ""
+
+msgid ""
+"/cleangraphics - remove all cached graphics. Usefull for content developers."
+msgstr ""
+
+msgid "/friend NICK, /befriend NICK - add nick to friends list."
+msgstr ""
+
+msgid "\"Change follow mode\""
+msgstr ""
+
+msgid "\"Scroll chat up\""
+msgstr ""
+
+msgid ""
+"##9 This file lists all contributors up to the current release. Check the wiki\n"
+"##9 for the currently active development team."
+msgstr ""
+
+msgid "/item - show party item sharing options."
+msgstr ""
+
+msgid "\"Inventory window\""
+msgstr ""
+
+msgid "Contributors to client/server development"
+msgstr ""
+
+msgid "\"Quick heal target or self\""
+msgstr ""
+
+msgid "\"Change pickup type\""
+msgstr ""
+
+msgid "\"Use #itenplz spell\""
+msgstr ""
+
+msgid "move key"
+msgstr ""
+
+msgid "\"Item shortcut 13\""
+msgstr ""
+
+msgid "Skills"
+msgstr "技能"
+
+msgid "\"Outfit shortcut 3\""
+msgstr ""
+
+msgid "\"Quick drop N items\""
+msgstr ""
+
+msgid "Themes:"
+msgstr ""
+
+msgid ""
+"/msg NICK text, /whisper NICK text, /w NICK text - send whisper message to "
+"nick."
+msgstr ""
+
+msgid "/movetotarget - move to target position."
+msgstr ""
+
+msgid "\"Emote shortcut 14\""
+msgstr ""
+
+msgid "/open URL - open url in browser."
+msgstr ""
+
+msgid "Commands"
+msgstr ""
+
+msgid "WINDOWS"
+msgstr "窗口"
+
+msgid "\"Outfit shortcut 9\""
+msgstr ""
+
+msgid "\"Emote shortcut 4\""
+msgstr ""
+
+msgid "\"Stop Attack\""
+msgstr ""
+
+msgid ""
+" The player list lists all of your acquaintances.  They are categorised as one\n"
+" of the following:"
+msgstr ""
+
+msgid "/cleanfonts - remove all cached render strings."
+msgstr ""
+
+msgid "/dumpgl - dump OpenGL version into chat."
+msgstr ""
+
+msgid "/outfit prev - wear previous outfit."
+msgstr ""
+
+msgid "\"Crazy moves\""
+msgstr ""
+
+msgid "Powered By"
+msgstr ""
+
+msgid "##2Party level2:##9 enables a char to create a party."
+msgstr ""
+
+msgid "/target NICK - select nick as target. Can be monster or player nick."
+msgstr ""
+
+msgid "To type chat message, press ###keyChat;"
+msgstr ""
+
+msgid "Translators"
+msgstr "译者"
+
+msgid "MOUSE:"
+msgstr "鼠标："
+
+msgid "\"Next chat tab line\""
+msgstr ""
+
+msgid "\"Set direction right\""
+msgstr ""
+
+msgid "/announce MESSAGE - show global message."
+msgstr ""
+
+msgid "Player relations"
+msgstr ""
+
+msgid "Search error"
+msgstr ""
+
+msgid ""
+"You can copy value from any bar,\n"
+"by right click on it and select in context menu \"Copy to chat\"."
+msgstr ""
+
+msgid "/closeall - close all whispers."
+msgstr ""
+
+msgid "/exp 1 - enable party experience sharing options."
+msgstr ""
+
+msgid "COMMANDS"
+msgstr "命令"
+
+msgid "\"Previous chat tab\""
+msgstr ""
+
+msgid "/serverunignoreall - unignore all whispers on server side."
+msgstr "/serverunignoreall —— 在服务器端取消忽视所有私信。"
+
+msgid "##9Magic skills can be obtain by doing quests and missions in game."
+msgstr ""
+
+msgid "\"Skill window\""
+msgstr ""
+
+msgid "\"Move to home location\""
+msgstr ""
+
+msgid "\"Toggle chat\""
+msgstr ""
+
+msgid "/talkpet TEXT - talk from your pet."
+msgstr ""
+
+msgid "\"Change attack type\""
+msgstr ""
+
+msgid "/clear - clear current chat tab."
+msgstr "/clear - 清楚当前的聊天项"
+
+msgid "\"On / off audio\""
+msgstr ""
+
+msgid "\"Emote shortcut 6\""
+msgstr ""
+
+msgid "\"Outfit shortcut 2\""
+msgstr ""
+
+msgid "You can change any key in keyboard settings."
+msgstr ""
+
+msgid "/dirs - show client dirs in debug chat tab."
+msgstr ""
+
+msgid "/movetohome - move to home position."
+msgstr ""
+
+msgid "/disconnect - quick disconnect from server."
+msgstr ""
+
+msgid "\"Switch quick drop counter\""
+msgstr ""
+
+msgid "\"Previous chat tab line\""
+msgstr ""
+
+msgid "\"Emote shortcut 13\""
+msgstr ""
+
+msgid "/disregard NICK - add nick to disregarded list."
+msgstr ""
+
+msgid "\"Item shortcut 1\""
+msgstr ""
+
+msgid "\"Outfit shortcut 8\""
+msgstr ""
+
+msgid "Manaplus Developers"
+msgstr "Manaplus 开发者"
+
+msgid "\"Change imitation mode\""
+msgstr ""
+
+msgid ""
+"##2ManaPlus##9 is extended client based on old code from ##2Mana##9 client.\n"
+" Added many features, improved perfomance, stability, security and more."
+msgstr ""
+
+msgid "##9Other skills can be obtain by doing quests and missions in game."
+msgstr ""
+
+msgid "/exp - show party experience sharing options."
+msgstr ""
+
+msgid "\"Reset video mode to safe value\""
+msgstr ""
+
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgstr ""
+
+msgid "Other"
+msgstr ""
+
+msgid ""
+" Otherwise see the @@team|Development Team@@ section to have a list of\n"
+" developers and how to contact them."
+msgstr ""
+
+msgid "\"Outfit shortcut 14\""
+msgstr ""
+
+msgid "/uploadconfig - upload main config into pastebin service."
+msgstr ""
+
+msgid "\"Quick drop N items from 0 slot\""
+msgstr ""
+
+msgid "/enablehighlight - enable highlight in current tab."
+msgstr ""
+
+msgid "\"Emote shortcut window\""
+msgstr ""
+
+msgid "\"Bot checker window\""
+msgstr ""
+
+msgid "/disableaway - disable away messages in current tab."
+msgstr ""
+
+msgid ""
+"/mail NICK MSG - send offline message to NICK. Working only in tmw server."
+msgstr ""
+
+msgid "DOWNLOADS"
+msgstr ""
+
+msgid "/disablehighlight - disable highlight in current tab."
+msgstr ""
+
+msgid "\"Item shortcut 15\""
+msgstr ""
+
+msgid "About The Mana World"
+msgstr ""
+
+msgid "/testparticle FILENAME - set test particle on player."
+msgstr ""
+
+msgid "\"Smilie\""
+msgstr ""
+
+msgid "Whispers commands"
+msgstr ""
+
+msgid ""
+" There you will find a list of all players you are acquainted with, as well as\n"
+" several configuration options:"
+msgstr ""
+
+msgid "\"Use magic attack\""
+msgstr ""
+
+msgid ""
+"You can see other player equiped items,\n"
+"by right click on player and select in context menu \"Show Items\"."
+msgstr ""
+
+msgid "Whispers"
+msgstr ""
+
+msgid "/url URL - insert url into chat."
+msgstr ""
+
+msgid "\"Wear outfit\""
+msgstr ""
+
+msgid "emote key"
+msgstr ""
+
+msgid "Search results"
+msgstr ""
+
+msgid "/help - show small help about chat commands. "
+msgstr ""
+
+msgid "\"Item shortcut 9\""
+msgstr ""
+
+msgid ""
+"You can set any client resolution. In settings in video tab,\n"
+"click on \"custom\" and enter for example: 900x500 and press ok."
+msgstr ""
+
+msgid "Main development"
+msgstr ""
+
+msgid "\"Help window\""
+msgstr ""
+
+msgid "/attack - attack target."
+msgstr "/attack - 攻击目标"
+
+msgid "\"Outfit shortcut 1\""
+msgstr ""
+
+msgid ""
+" You may find that not all communication is to your liking.  While most people\n"
+" are nice, some may offend you or try to make your life harder-- since this is\n"
+" an open game, there is nothing the developers can do to prevent this."
+msgstr ""
+
+msgid "About"
+msgstr "关于"
+
+msgid "\"Change attack weapon type\""
+msgstr ""
+
+msgid "\"Emote shortcut 12\""
+msgstr ""
+
+msgid "\"Outfit shortcut 15\""
+msgstr ""
+
+msgid "Windows"
+msgstr "窗口"
+
+msgid "\"Ignore input 2\""
+msgstr ""
+
+msgid "\"Emulate right click from keyboard\""
+msgstr ""
+
+msgid "\"Set home location/set arrow\""
+msgstr ""
+
+msgid "\"Set direction left\""
+msgstr ""
+
+msgid "\"Move left\""
+msgstr ""
+
+msgid "##2Emote:##9 enables the ability to express emotions."
+msgstr ""
+
+msgid "\"Item shortcut window\""
+msgstr ""
+
+msgid "\"Item shortcut 7\""
+msgstr ""
+
+msgid "\"Emote shortcut 8\""
+msgstr ""
+
+msgid "\"Minimap window\""
+msgstr ""
+
+msgid "\"Equipment window\""
+msgstr ""
+
+msgid "/serverignoreall - ignore all whispers on server side."
+msgstr "/serverignoreall - 在服务器端忽视所有私信。 "
+
+msgid "/notice TEXT - set notice guild text."
+msgstr ""
+
+msgid "\"Emote shortcut 3\""
+msgstr ""
+
+msgid ""
+" However, you can protect yourself from such players by ignoring them.  Right-\n"
+" click on them to bring up the context menu, then select `Ignore' or\n"
+" `Disregard' (see below).  You can fine-tune your player relations in the\n"
+" `Setup' menu, which lists all the players you have added to it.  To open this\n"
+" menu, select `Setup' in the upper right corner of the screen, then `Relations'."
+msgstr ""
+
+msgid "/dumpt - dump tests info into chat."
+msgstr ""
+
+msgid "Different patches"
+msgstr ""
+
+msgid "\"Switch magic attack\""
+msgstr ""
+
+msgid "/navigate x y - move to position x,y in current map in any distance."
+msgstr ""
+
+msgid "SKILLS"
+msgstr ""
+
+msgid "Guild chat commands"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "\"Item shortcut 12\""
+msgstr ""
+
+msgid "\"Move to navigation point\""
+msgstr ""
+
+msgid "Sound effects"
+msgstr ""
+
+msgid "SHORTCUTS:"
+msgstr ""
+
+msgid "\"Talk\""
+msgstr ""
+
+msgid ""
+" Left click to execute default action: walk, pick up an item, attack a monster\n"
+" and talk to NPCs (be sure to click on their feet). Right click to show up a\n"
+" context menu. Holding [Left Shift] prevents from walking when attacking."
+msgstr ""
+
+msgid "/follow NICK - start follow mode."
+msgstr ""
+
+msgid "\"Item shortcut 8\""
+msgstr ""
+
+msgid "/emote N - use emotion number N."
+msgstr ""
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4944fc733..34495dcda 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,6 +9,14 @@ src/commands.cpp
 src/commands.h
 src/dyetool/dyemain.cpp
 src/game.cpp
+src/gui/models/colorlistmodel.h
+src/gui/models/colormodel.cpp
+src/gui/models/magicschoolmodel.h
+src/gui/models/playerrelationlistmodel.h
+src/gui/models/sortlistmodelbuy.h
+src/gui/models/sortlistmodelinv.h
+src/gui/models/targettypemodel.h
+src/gui/models/updatetypemodel.h
 src/gui/popups/beingpopup.cpp
 src/gui/popups/itempopup.cpp
 src/gui/popups/popupmenu.cpp
@@ -17,7 +25,6 @@ src/gui/sdlinput.h
 src/gui/setupactiondata.h
 src/gui/userpalette.cpp
 src/gui/widgets/characterdisplay.cpp
-src/gui/widgets/colormodel.cpp
 src/gui/widgets/itemcontainer.cpp
 src/gui/widgets/itemlinkhandler.cpp
 src/gui/widgets/setupitem.cpp
diff --git a/po/ar.po b/po/ar.po
index b53e4aac9..69e7b8425 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "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"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,387 +111,387 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -501,42 +501,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "تثبيت"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -548,13 +548,13 @@ msgstr "مرئية"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -567,11 +567,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -591,17 +591,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -616,83 +616,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "خطأ"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr ""
 
@@ -892,25 +892,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -933,65 +933,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -999,7 +1220,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1013,49 +1234,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1073,9 +1294,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1084,7 +1305,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1095,9 +1316,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "شراء"
 
@@ -1108,9 +1329,9 @@ msgstr "شراء"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "بيع"
 
@@ -1118,26 +1339,26 @@ msgstr "بيع"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1145,7 +1366,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1153,7 +1374,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1176,69 +1397,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "إلغاء"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1248,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1270,77 +1491,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1350,68 +1571,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1420,64 +1641,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1485,57 +1706,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "استخدام"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1543,134 +1763,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1678,9 +1898,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
@@ -1688,22 +1908,22 @@ msgstr "تجريد من العتاد"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "استعمال العتاد"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1711,56 +1931,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "إسقاط"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "قسم"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1875,10 +2095,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "مغادرة"
 
@@ -2440,12 +2660,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2465,11 +2685,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "حذف"
 
@@ -2505,23 +2724,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2529,7 +2748,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2585,7 +2804,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2611,7 +2830,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2745,99 +2964,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2848,30 +3007,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2885,157 +3044,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "سمعيّ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3058,8 +3213,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3228,100 +3383,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3330,50 +3485,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "معايرة"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "إيقاف"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3388,279 +3543,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "منخفض"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "مرتفع"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3668,279 +3813,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "لا"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4021,401 +4166,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4525,323 +4629,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "واقف"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "الحالة"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "العتاد"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "الجردة"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "مهارات"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4853,7 +4948,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4862,61 +4957,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4926,9 +4981,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4938,18 +4993,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "إنشاء"
 
@@ -4958,7 +5013,7 @@ msgstr "إنشاء"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5006,7 +5061,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5015,7 +5070,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "كلمة السرّ:"
@@ -5048,7 +5103,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5056,9 +5111,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "الاسم:"
 
@@ -5066,11 +5121,11 @@ msgstr "الاسم:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5079,134 +5134,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5216,48 +5271,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,12 +5308,12 @@ msgid "Yes"
 msgstr "نعم"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5503,61 +5543,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "المنفذ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5567,47 +5607,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5726,62 +5766,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "ولوج"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "تسجيل"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "الخادوم:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5858,17 +5888,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "التّالي"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5877,9 +5907,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "إضافة"
 
@@ -5899,7 +5929,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5915,40 +5945,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "تبديل الخادوم"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "تبديل الشخصيّة"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "تأكيد:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "البريد الإلكترونيّ:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5956,128 +5986,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "تطبيق"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6106,277 +6136,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6418,149 +6448,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "اقتراح متاجرة"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "تغيير"
 
@@ -6570,12 +6555,12 @@ msgid "You give:"
 msgstr "أنت تقدّم:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6587,36 +6572,36 @@ msgid "Name: %s"
 msgstr "الاسم: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6646,42 +6631,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6689,7 +6674,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6824,163 +6809,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "القوّة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "نشاط:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "المهارة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7032,58 +7017,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7091,22 +7076,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7126,290 +7111,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7779,7 +7764,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 2751d0084..b71db8a11 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -563,11 +563,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Непозната команда."
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1091,9 +1312,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1104,9 +1325,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1114,26 +1335,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr ""
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr ""
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2581,7 +2800,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4858,61 +4953,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr ""
 
@@ -4954,7 +5009,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5011,7 +5066,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr ""
 
@@ -5062,11 +5117,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5865,9 +5895,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 203c40b7c..f9c94fb88 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -20,87 +20,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorant sol·licituds d'intercanvi. "
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "esquiva "
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Has intentat agafar un objecte inexistent. "
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "L'objecte es massa pesant. "
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "L'inventari està complet. "
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "La pila d'objectes es massa gran. "
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "L'objecte pertany a una altra persona. "
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr "Problema desconegut al agafar l'objecte. "
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] "Has recollit %d [@@%d|%s@@]. "
 msgstr[1] "Has recollit %d [@@%d|%s@@]. "
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "treball "
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) Moviments per defecte"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) Invertir moviments "
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moure's amb alguns moviments boigs  "
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(c) Mou-te amb moviments boigs "
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) moviment boig personalitzat"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) moviment boig "
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) moviment a objectiu per defecte "
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) mou-te al objectiu a la distància 1 "
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) mou-te al objectiu a la distància 3 "
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) mou-te al objectiu a la distància 5 "
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) mou-te al objectiu a la distància 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) mou-te al objectiu a la distància d'atac "
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) mou-te al objectiu "
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) seguiment per defecte "
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) seguiment relatiu "
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) seguiment tipus mirall "
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) seguiment de mascota "
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) seguiment desconegut"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) atac "
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) atac per defecte "
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) selecciona atac sense escut "
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) selecciona atac amb escut "
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) ves i ataca "
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) ves, ataca i agafa"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) sense auto atac "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) àrea de recollida petita 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) àrea de recollida per defecte 2x1 "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) àrea àmplia de recollida 2x3 "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) àrea de recollida 3x3 "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) agafa a una distància de 4 "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) agafa a una distància de 8 "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) agafa a distància màxima "
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) agafa "
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) Visualització de mapa normal "
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) visualització de mapa \"depurador\" "
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) visualització de mapa ultra "
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) visualització de mapa ultra 2 "
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) visualització de mapa buida "
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) visualització de mapa blanc i negre "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utilitza #flar per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) utilitza #chiza per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) utilitza #igrav per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) utilitza #chiza per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) utilitza #upmarmu per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) atac màgic "
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) imitació per defecte "
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) imitació de vestimenta "
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitació "
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Lluny del teclat "
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) al teclat "
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) absent "
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) absent "
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) mode càmera de joc "
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) mode de càmera lliure "
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Els modificadors de joc estan activats "
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Els modificadors de joc estan desactivats "
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignorar completament "
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Imprimir '...' "
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Parpelleig de nom "
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Bombolla '...' flotant "
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Bombolla flotant "
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configuració "
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr "Vídeo "
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema "
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ajuda "
@@ -564,11 +564,11 @@ msgstr "Ajuda "
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Tancar"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr "Entrant al mon de joc "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -613,83 +613,83 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Error "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Canvi de contrasenya "
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit! "
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Canvi de correu "
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit! "
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit "
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis... "
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s no existeix i no pot ser creat! Sortint."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Error creant el directori d'actualitzacions! "
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s no existeix i no pot ser creat! Sortint."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Comandament desconegut. "
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Depurador "
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla! "
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Error de xarxa "
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "Per defecte "
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "negre"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "roig"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "verd"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "blau "
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "daurat"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "groc"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "lila"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "gris"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "marró "
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "arc de sant martí 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "arc de sant martí 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "arc de sant martí 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Màgia General "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Màgia de Vida "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Màgia de Guerra "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Màgia de Transmutació "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Màgia de la Natura "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Màgia Astral "
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Amic"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Desatès "
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorat "
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Esborrat "
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Cap objectiu "
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Habilita objectiu "
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Es necessita objectiu"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal "
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Tanca automàticament "
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Omet "
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grup: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gremi: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Pes: %s"
@@ -996,7 +1217,7 @@ msgstr "Pes: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Intercanvi "
@@ -1010,49 +1231,49 @@ msgstr "Intercanvi "
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Atacar "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Moure"
@@ -1081,7 +1302,7 @@ msgstr "Moure"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Parlar "
@@ -1092,9 +1313,9 @@ msgstr "Parlar "
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1105,9 +1326,9 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Vendre "
 
@@ -1115,26 +1336,26 @@ msgstr "Vendre "
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Cancel·lar "
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Jugadors "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Element del mapa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Conjunt  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Conjurs "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Netejar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Desactivar ressaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Activa resaltat "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Borrar nom "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Habilitar absència "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Des-habilita absència "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Deixa"
 
@@ -1347,68 +1568,68 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Canviar el nom de la marca de mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nom:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Agregar-ne 10 al intercanvi "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Agregar-ne la mitat al intercanvi "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi "
 
@@ -1417,64 +1638,64 @@ msgstr "Agregar-los tots al intercanvi "
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Botiga "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Emmagatzema 10 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Emmagatzema la mitat "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Recuperar "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Recuperar la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -1482,57 +1703,56 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Utilitzar "
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Amagar "
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Mostrar "
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Des-equipar "
 
@@ -1685,22 +1905,22 @@ msgstr "Des-equipar "
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Deixar caure... "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Deixar caure "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr "Selecciona OK "
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Sortir"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Esborra "
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Dreceres "
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Xat "
 
@@ -2582,7 +2801,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstres "
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efectes de partícules "
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Diners: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr "negre"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr "roig"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr "verd"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr "blau "
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr "daurat"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr "groc"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr "rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr "lila"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr "gris"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr "marró "
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr "Batalla "
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Anunci global:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anunci global de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s xiuxiueigs: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gremi "
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Àudio "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Permet Àudio "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Permet música "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Permet sfx del joc"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Permet sfx del gremi "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volum de sfx "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volum de la música "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Permet xat de veu de mumble "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Descarregar música "
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Colors"
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Així es com es veu el color"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tipus:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Retard: "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Vermell: "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Verd: "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Blau: "
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Estàtic"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pols"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Arc de Sant Martí "
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Espectre"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa: "
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Assignar "
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Des-assignar "
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Per defecte "
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicte de tecla(es) detectat. "
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr "Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat p
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Pressiona el botó per començar a calibrar "
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibrar "
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Activar joystick "
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick "
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Atura "
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "Per defecte "
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "baix "
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "mitjà "
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "alt "
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Divers "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Mostra dany infligit als monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Auto apuntar només a monstres al abast "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Ressaltar abast del monstre "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Mostra barra de vida de monstres "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Encercla objectiu del monstre "
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapa "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Mostra partícules de portal "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Ressaltar portals de mapa  "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Ressalta objectes del terra "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Ressaltar abast del jugador "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Mostra minimapes estesos "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Dibuixa trajectòria "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Dibuixar tecles d'accés ràpid al mapa  "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Corregir posició automàticament "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Atacar en moviment "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Sincronitzar moviment del jugador "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Programa de moviments boigs A "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Mostra barra de vida pròpia "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Habilita estadístiques ràpides "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Encercla objectiu del jugador "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Mostra missatges d'experiència de treball "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Mostra finestres emergents de jugadors "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Mostra treball "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Botiga "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Acceptar peticions de compra/venda "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Permet mode botiga "
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Registra els diàlegs de NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Habilitar atac del cantó del servidor "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Permet comprovador de bots "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Permet registre de depurador "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Mode de baix tràfic "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Amaga sprite de protector "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Mostra fons "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "no"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Acceleració de hardware "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nom"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relació "
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Amic"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Desatès "
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorat "
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Esborrat "
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Permet intercanvis "
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Permet xiuxiueigs "
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Quan ignoris: "
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Diminut (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Petit (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Mitjà (12) "
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Tema de la interfície  "
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Font principal "
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Font en negreta "
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Font de partícula "
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Font d'ajuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Mida de la font  "
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema canviat "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el client per que els canvis tinguin efecte."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal "
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa. "
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Sense text "
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Text "
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bombolles sense noms"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bombolles amb noms"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "apagat"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Opacitat d'interfície "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Sobrecàrrega de text"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Efectes d'ambient "
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "màxim "
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detall de partícules "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Qui està en línia "
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Comprovador de Bot "
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Estadística de morts "
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Estat "
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipament "
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV "
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventari "
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Habilitats "
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Especials "
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Social "
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "CON"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Clau: %s"
@@ -4850,7 +4945,7 @@ msgstr "Comprovador de bots "
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reajustar "
 
@@ -4859,61 +4954,21 @@ msgstr "Reajustar "
 msgid "Result"
 msgstr "Resultat"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preu: %s / Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4923,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4935,18 +4990,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Crear"
 
@@ -4955,7 +5010,7 @@ msgstr "Crear"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr "Les direccions de correu no coincideixen."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Canviar contrasenya "
 
@@ -5012,7 +5067,7 @@ msgstr "Canviar contrasenya "
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Contrasenya: "
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr "Les noves contrasenyes no coincideixen. "
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "nom"
 
@@ -5063,11 +5118,11 @@ msgstr "nom"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5076,134 +5131,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Color de cabells: "
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Pentinat: "
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Home"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Dona"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribueix %d punts"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nom ha de tenir com a mínim 4 caràcters. "
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Estadístiques de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Has de treure %d punts"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confirma l'eliminació de personatge "
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Estàs segur que bols esborrar aquest personatge? "
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Canvia compta d'accés "
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Juga"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Informació "
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "No registrat"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Canvia correu "
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "arc de sant martí 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "arc de sant martí 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "arc de sant martí 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Present: %s; %d jugadors estan presents. "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Xiuxiuejant a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "si"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Connectar "
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Tipus de servidor: "
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Tot"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Selecciona la quantitat d'objectes per intercanviar. "
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Selecciona la quantitat d'objectes per deixar caure. "
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Selecciona la quantitat d'objectes per guardar emmagatzemar. "
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Selecciona la quantitat d'objectes per recuperar. "
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Selecciona la quantitat d'objectes per dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Afegir a la botiga \"comprar\". "
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Afegir a la botiga \"vendre\". "
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Desconegut."
 
@@ -5715,62 +5755,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Tanca automàticament "
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Omet "
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Inicia la sessió "
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Recordar usuari "
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Actualitzar:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Canviar Servidor "
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrar "
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Servidor d'actualització personalitzat "
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Servidor: "
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5847,17 +5877,17 @@ msgid "Job level: %d"
 msgstr "Nivell de treball: %d "
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Següent "
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Envia"
 
@@ -5866,9 +5896,9 @@ msgstr "Envia"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Afegeix "
 
@@ -5888,7 +5918,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Error al enviar o carta invàlida. "
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Conjunt: %d"
@@ -5904,40 +5934,40 @@ msgid "Away outfit"
 msgstr "Conjunt d'ausent"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Escollir servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Escollir personatge "
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Confirmar: "
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Correu:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5945,128 +5975,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen. "
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Escolleix el teu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Carregar "
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Utilitza la mateixa ip per a sub-servidors del joc "
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Descarregant llista de servidors...%2.2f%% "
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Esperant el servidor... "
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Preparant descàrrega "
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Error recuperant llista de servidors! "
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "requereix una nova versió "
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "requereix v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Aplicar "
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Restaurar finestres "
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Botiga personal "
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Comprar objectes "
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Vendre objectes "
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Anunciar "
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Mostra enllaços al anunci "
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Petició d'intercanvi "
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vol %s %s acceptes? "
@@ -6095,277 +6125,277 @@ msgid "Skill %d"
 msgstr "Habilitat %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Ha invitat a l'usuari %s al gremi %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "El gremi %s demana la sortida. "
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Membre invitat al gremi "
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui voldries invitar al gremi %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Deixar gremi "
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Estàs segur que vols deixar el gremi %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grup"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Ha invitat al usuari %s al grup. "
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Renuncia al grup %s sol·licitada. "
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Invitació d'un membre al grup"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voldries invitar al grup %s? "
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Deixar Grup? "
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Estàs segur que vols deixar el grup %s? "
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Crear grup "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Invita "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Acceptada invitació a grup de %s. "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Refusada invitació al grup de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Acceptada invitació a gremi de %s. "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Refusada invitació al gremi de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creant gremi anomenat %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creant grup anomenat %s. "
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nom de gremi "
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Selecciona nom del gremi. "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Invitació al grup rebuda, però ja n'hi ha una existent. "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'ha invitat al gremi %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Acceptar invitació a gremi "
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Rebuda invitació a grup, però ja n'hi ha una d'existent. "
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Has estat invitat a unir-te a un grup. "
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has estat invitat a unir-te al grup %s. "
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'ha invitat a unir-te al seu grup. "
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'ha invitat a unir-te al grup %s. "
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Acceptar invitació a grup "
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "No es pot crear grup. Ja en pertanys a un. "
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nom del grup"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Tria el nom del teu grup."
 
@@ -6407,149 +6437,104 @@ msgstr "Punts de personatge: %d "
 msgid "Correction points: %d"
 msgstr "Punts de correcció: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Cap objectiu "
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Habilita objectiu "
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Es necessita objectiu"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Màgia General "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Màgia de Vida "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Màgia de Guerra "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Màgia de Transmutació "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Màgia de la Natura "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Màgia Astral "
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Editor d'ordres "
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "màgia  "
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "altres "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Símbol: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Ordre: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Tipus d'objectiu: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icona: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Nivell Màgic: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Escola de màgia: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Nivell d'escola: "
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Guardar "
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Proposar intercanvi "
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confirmat. Espera... "
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Acceptar intercanvi"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Acceptat. Espera..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Intercanvi: Tu "
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Aconsegueixes %s "
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Canvi"
 
@@ -6559,12 +6544,12 @@ msgid "You give:"
 msgstr "Ofereixes: "
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "No tens diners suficients.  "
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
@@ -6576,36 +6561,36 @@ msgid "Name: %s"
 msgstr "Nom: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Actualitzant... "
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Connectant... "
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 El procés d'actualització està incomplet. "
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Això es altament recomanat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1 tornes a provar més tard. "
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Complet "
 
@@ -6635,42 +6620,42 @@ msgid "Who Is Online - Update"
 msgstr "Qui Està En Línia - Actualitza "
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Escolleix Món "
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Canvia de sessió "
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Tria Món  "
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6813,163 +6798,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7021,58 +7006,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Antiga contrasenya incorrecta "
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Error desconegut. "
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7080,22 +7065,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7115,290 +7100,290 @@ msgid "Connection to server terminated. "
 msgstr "Connexió interrompuda amb el servidor. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Autenticació fallida. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "No hi ha cap servidor disponible. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Algú altre està provant d'utilitzar aquest compte. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Aquest compte ja està sent utilitzat. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Hack de desplaçament ràpid detectat. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Accès de sessió duplicat.  "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Error de connexió desconegut. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Has estat desconnectat del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Força "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agilitat "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalitat "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intel·ligència  "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Destresa "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Sort "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Defensa "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Atac màgic "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Defensa màgica "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisió "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasió "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Crític "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Retard d'atac "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Demora a peu "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Distància d'atac "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s bol un intercanvi amb tu, acceptes? "
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7768,7 +7753,7 @@ msgstr "OpenGL segur"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sense nom "
 
diff --git a/po/cs.po b/po/cs.po
index 10e555d11..19405792a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,13 +6,14 @@
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pitriss <chytrex@wjake.com>, 2011
 # Pitriss V <chytrex_fsude@centrum.cz>, 2011
+# samuraiii <samurai.no.dojo@gmail.com>, 2014
 # Zirry <zirry@centrum.cz>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -23,523 +24,523 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
-msgstr ""
+msgstr "Člověk"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
-msgstr "uskočil"
+msgstr "uskočení"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
-msgstr "minul"
+msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
-msgstr ""
+msgstr "Byl jsi zabit %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Sebral jsi  %d [@@%d|%s@@]."
+msgstr[1] "Sebral jsi  %d [@@%d|%s@@]."
+msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
-msgstr ""
+msgstr "zk"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
-msgstr ""
+msgstr "práce"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
-msgstr ""
+msgstr "(?) neznámý pohyb"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) šílené pohyby číslo %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
-msgstr ""
+msgstr "(a) dosah útoku lučštníka"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) jdi na útočnou vzdálenost -1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) následování mazlíčka"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) útok"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) sběr před 2x3 pole"
+msgstr "(F) sběr přes 2x3 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) útoč na všecky hráče"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
-msgstr ""
+msgstr "(f) útočit na všecky krom přátel"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) útoč na ty se špatnými vztahy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
-msgstr ""
+msgstr "(d) neútočit na hráče"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) útok hráče proti hráči"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Pryč"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
-msgstr ""
+msgstr "Modifikátory hry nejsou známy"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
-msgstr ""
+msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
-msgstr ""
+msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
-msgstr ""
+msgstr "Vidíš %s"
 
 #. TRANSLATORS: ignore/unignore action
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
-msgstr ""
+msgstr "Zobrazovat '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
-msgstr ""
+msgstr "Blikat jménem"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Plovoucí '...' bublina"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
-msgstr ""
+msgstr "Plovoucí bublina"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
-msgstr ""
+msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
@@ -549,13 +550,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Nápověda"
@@ -568,11 +569,11 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Zavřít"
 
@@ -592,19 +593,19 @@ msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
-msgstr "Požaduji postavy"
+msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
-msgstr "Zaměňuji herní servery"
+msgstr "Vyměňuji herní servery"
 
 #. TRANSLATORS: error dialog header
 #. TRANSLATORS: error message header
@@ -617,83 +618,83 @@ msgstr "Zaměňuji herní servery"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s neexistuje a vytvoření selhalo. Končím."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
-msgstr ""
+msgstr "Neplatný host pro update: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
-msgstr ""
+msgstr "Preješ si otevřít stránku podpory?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
@@ -727,7 +728,7 @@ msgstr "Hráč nemůže být zařazen jako %s!"
 #. TRANSLATORS: whisper send
 #: src/commands.cpp:351
 msgid "Cannot send empty whispers!"
-msgstr "Nelze zaslat prázdné šeptání!"
+msgstr "Nelze možné zaslat prázdné šeptání!"
 
 #. TRANSLATORS: new whisper query
 #: src/commands.cpp:369
@@ -743,7 +744,7 @@ msgstr ""
 #. TRANSLATORS: clear fonts cache message
 #: src/commands.cpp:388 src/commands.cpp:399
 msgid "Cache cleaned"
-msgstr ""
+msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -754,7 +755,7 @@ msgstr "Chybí jméno party."
 #. TRANSLATORS: create guild message
 #: src/commands.cpp:427
 msgid "Guild name is missing."
-msgstr "Chybí jméno guildy."
+msgstr "Chybí jméno gildy."
 
 #: src/commands.cpp:464
 msgid "Return toggles chat."
@@ -807,12 +808,12 @@ msgstr "Hráč nemůže být odignorován!"
 #. TRANSLATORS: blacklist command
 #: src/commands.cpp:572
 msgid "blacklisted"
-msgstr ""
+msgstr "na černé listině"
 
 #. TRANSLATORS: enemy command
 #: src/commands.cpp:578
 msgid "enemy"
-msgstr ""
+msgstr "nepřítel"
 
 #. TRANSLATORS: erase command
 #: src/commands.cpp:598
@@ -839,83 +840,83 @@ msgstr "Doba běhu klienta: %s"
 #: src/commands.cpp:919
 #, c-format
 msgid "%d week"
-msgstr ""
+msgstr "%d týdnů"
 
 #: src/commands.cpp:919
 #, c-format
 msgid "%d weeks"
-msgstr ""
+msgstr "%d týdnů"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:930
 #, c-format
 msgid "%d day"
-msgstr ""
+msgstr "%d dní"
 
 #: src/commands.cpp:930
 #, c-format
 msgid "%d days"
-msgstr ""
+msgstr "%d dní"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:940
 #, c-format
 msgid "%d hour"
-msgstr ""
+msgstr "%d hodin"
 
 #: src/commands.cpp:940
 #, c-format
 msgid "%d hours"
-msgstr ""
+msgstr "%d hodin"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:950
 #, c-format
 msgid "%d minute"
-msgstr ""
+msgstr "%d minut"
 
 #: src/commands.cpp:950
 #, c-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d minut"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:960
 #, c-format
 msgid "%d second"
-msgstr ""
+msgstr "%d second"
 
 #: src/commands.cpp:960
 #, c-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d vteřin"
 
 #. TRANSLATORS: dump environment command
 #: src/commands.cpp:1118
 msgid "Environment variables dumped"
-msgstr ""
+msgstr "Systémové proměnné uloženy"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
-msgstr ""
+msgstr "Nahráno nastavení do:"
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
-msgstr ""
+msgstr "Nahráno nastavení serveru do:"
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
-msgstr ""
+msgstr "Nahrány záznmy do:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
-msgstr ""
+msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
-msgstr ""
+msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: chat option changed message
 #: src/commands.h:35
@@ -925,76 +926,297 @@ msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcfile dyestring dstfile"
-msgstr ""
+msgstr "dyecmd srcfile dyestring dstfile"
 
 #: src/dyetool/dyemain.cpp:50
 msgid "or"
-msgstr ""
+msgstr "nebo"
 
 #: src/dyetool/dyemain.cpp:51
 msgid "dyecmd srcdyestring dstfile"
-msgstr ""
+msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
-msgstr "Obecná"
+msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
-msgstr ""
+msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Chyba sítě"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "výchozí"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "černá"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "červená"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "zelená"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "modrá"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "zlatá"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "žlutá"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "růžová"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "fialová"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "šedá"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "hnědá"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "duhová 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "duhová 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "duhová 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Obecná magie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magie života"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magie války"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magie přeměn"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magie přírody"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astrální Magie"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutrální"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Přítel"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Přehlížený"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorovaný"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Vymazán"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Na černé listině"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Nepřítel"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "neseřazené"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "podle ceny"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "dle jména"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "dle id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "dle váhy"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "dle množství"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "dle typu"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Žádný cíl"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr " Povolit zaměření"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Zaměř Cíl"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normální"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Automaticky zavírat"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Přeskočit"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Parta: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PVP hodnost: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
@@ -1002,7 +1224,7 @@ msgstr "Váha: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Obchod"
@@ -1016,51 +1238,51 @@ msgstr "Obchod"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
-msgstr "Zaútoč"
+msgstr "Útok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
-msgstr ""
+msgstr "Vyhladit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
@@ -1076,9 +1298,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Jdi sem"
@@ -1087,7 +1309,7 @@ msgstr "Jdi sem"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Promluv"
@@ -1098,9 +1320,9 @@ msgstr "Promluv"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1111,9 +1333,9 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Prodej"
 
@@ -1121,34 +1343,34 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Přidat komentář"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
-msgstr ""
+msgstr "Vyřadit ze seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "Přidat do prioritního seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
-msgstr ""
+msgstr "Přidat do seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -1156,7 +1378,7 @@ msgstr "Vložit do seznamu ignorovaných"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
@@ -1179,69 +1401,69 @@ msgstr "Vložit jméno do chatu"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
-msgstr "Vložit do chatu"
+msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Označit na mapě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -1251,101 +1473,101 @@ msgstr "Přejmenovat"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
-msgstr ""
+msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
-msgstr ""
+msgstr "Přesunout kameru"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
-msgstr ""
+msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
-msgstr "Vyprázdnit"
+msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
-msgstr "Odejít"
+msgstr "Opustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy selected text to clipboard
@@ -1353,134 +1575,134 @@ msgstr "Odejít"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Kopírovat do schránky"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Jméno:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Hráčův komentář"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Komentář:                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
-msgstr "Přidat do transakce"
+msgstr "Přidat k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
-msgstr "Přidat 10 do transakce"
+msgstr "Přidat 10 k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
-msgstr "Přidat polovinu do transakce"
+msgstr "Přidat polovinu k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
-msgstr "Přidat vše do transakce"
+msgstr "Přidat vše k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to storage
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -1488,57 +1710,56 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
-msgstr ""
+msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
-msgstr ""
+msgstr "(výchozí)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -1546,167 +1767,167 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
-msgstr "Svléct"
+msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
-msgstr ""
+msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
-msgstr ""
+msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
-msgstr ""
+msgstr "Otevřít odkaz "
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
-msgstr ""
+msgstr "Zobrazit okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
-msgstr ""
+msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
-msgstr ""
+msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
-msgstr "imitovat"
+msgstr "Imitace"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
-msgstr "Zobrazit věci"
+msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
-msgstr "Vyjmi ze seznamu sběru"
+msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
-msgstr ""
+msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
-msgstr ""
+msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
-msgstr "Odstranit z vybavení"
+msgstr "Odebrat z vybavení"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -1714,63 +1935,63 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Rozdělit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
-msgstr ""
+msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
-msgstr ""
+msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
-msgstr ""
+msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
-msgstr ""
+msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
-msgstr ""
+msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
-msgstr ""
+msgstr "Oživ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:45
 msgid "Target and attack keys"
-msgstr ""
+msgstr "Zaměřovací a útočné klávesy"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:57
@@ -1805,17 +2026,17 @@ msgstr "Jdi na navigační bod"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:99
 msgid "Stop Attack / Modifier key"
-msgstr ""
+msgstr "Zastavit útok / Modifikační klávesa"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:105
 msgid "Untarget"
-msgstr ""
+msgstr "Zrušit zaměření"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:111
 msgid "Target monster"
-msgstr ""
+msgstr "Zaměřit monstrum"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:117
@@ -1830,7 +2051,7 @@ msgstr "Zaměřit hráče"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:129
 msgid "Other Keys"
-msgstr ""
+msgstr "Ostatní klávesy"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:135
@@ -1860,7 +2081,7 @@ msgstr "Zapnout/Vypnout obchody"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:165
 msgid "Open trade window"
-msgstr ""
+msgstr "Otevřít okno obchodu"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:171
@@ -1878,17 +2099,17 @@ msgstr "Vybrat OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Ukončit"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:189
 msgid "Stop or sit"
-msgstr ""
+msgstr "Zastavit nebo posadit se"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:195
@@ -1898,7 +2119,7 @@ msgstr "Návrat k bezpečnému video módu"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:210
 msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "Modifikátory zkratkových kláves"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:216
@@ -1908,7 +2129,7 @@ msgstr "Zkratková klávesa předmětů"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:222
 msgid "Shortcuts keys"
-msgstr ""
+msgstr "Zkratkové klávesy"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:228 src/gui/setupactiondata.h:234
@@ -1923,12 +2144,12 @@ msgstr ""
 #: src/gui/setupactiondata.h:336 src/gui/setupactiondata.h:342
 #, c-format
 msgid "Item Shortcut %d"
-msgstr ""
+msgstr "Zkratka předmětu %d"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:357
 msgid "Show Windows Menu"
-msgstr ""
+msgstr "Zobrazit menu oken"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:363
@@ -1988,7 +2209,7 @@ msgstr "Debug okno"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:429
 msgid "Social Window"
-msgstr "Okno spolešenství"
+msgstr "Okno společenství"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:435
@@ -2013,7 +2234,7 @@ msgstr "Okno rychlého upuštění"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:459
 msgid "Kill Stats Window"
-msgstr ""
+msgstr "Okno statistik zabití"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:465
@@ -2053,37 +2274,37 @@ msgstr "Další záložka společenství"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:507
 msgid "Previous Shortcuts tab"
-msgstr ""
+msgstr "Předchozí záložka zkratek"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:513
 msgid "Next Shortcuts tab"
-msgstr ""
+msgstr "Další záložka zkratek"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:519
 msgid "Previous Commands tab"
-msgstr ""
+msgstr "Předchozí záložka příkazů"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:525
 msgid "Next Commands tab"
-msgstr ""
+msgstr "Další záložka příkazů"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:540
 msgid "Emote modifiers keys"
-msgstr ""
+msgstr "Modifikátory smajlíkových kláves"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:546
 msgid "Emote modifier key"
-msgstr ""
+msgstr "Modifikátor Smajlíkových kláves"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:552
 msgid "Emote shortcuts"
-msgstr ""
+msgstr "Zkratky smajlíků"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:558 src/gui/setupactiondata.h:564
@@ -2117,7 +2338,7 @@ msgstr "Zkratka smajlíku %d"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:855
 msgid "Outfits keys"
-msgstr ""
+msgstr "Klávesy výbav"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:861
@@ -2137,7 +2358,7 @@ msgstr "Kopírovat výbavu do výstroje"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:879
 msgid "Outfits shortcuts"
-msgstr ""
+msgstr "Zkratky výbav"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:885 src/gui/setupactiondata.h:891
@@ -2166,7 +2387,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:1161 src/gui/setupactiondata.h:1167
 #, c-format
 msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "Zkratka výbavy %d"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1182
@@ -2211,7 +2432,7 @@ msgstr "Další řádek chatu"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1230
 msgid "Chat modifier key"
-msgstr ""
+msgstr "Klávesa modifikátoru chatu"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1245
@@ -2256,17 +2477,17 @@ msgstr "Změnit mód šílených pohybů"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1293
 msgid "Quick Drop N Items from 0 slot"
-msgstr "Rychle zahoď N předmětů ze slotu 0"
+msgstr "Rychle upusť N předmětů z místa 0"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1299
 msgid "Quick Drop N Items"
-msgstr "Rychle zahoď N předmětů"
+msgstr "Rychle upusť N předmětů"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1305
 msgid "Switch Quick Drop Counter"
-msgstr "Přepni počet rychlého zahození"
+msgstr "Přepni počet rychlého upuštění"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1311
@@ -2291,7 +2512,7 @@ msgstr "Přepnout magický útok"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1335
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Změnit útok hráče proti hráči"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1341
@@ -2321,7 +2542,7 @@ msgstr "Změnit mód imitace"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1371
 msgid "Disable / Enable Game modifier keys"
-msgstr ""
+msgstr "Zakázat / Povolit klávesy modifikce hry"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1377
@@ -2346,12 +2567,12 @@ msgstr "přemnout mód kamery"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1401
 msgid "Show onscreen keyboard"
-msgstr ""
+msgstr "Zobrazit klávesnici na obrazovce"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1416
 msgid "Move Keys"
-msgstr ""
+msgstr "Pohybové klávesy"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1422 src/gui/setupactiondata.h:1761
@@ -2376,12 +2597,12 @@ msgstr "Pohyb vpravo"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1446
 msgid "Move Forward"
-msgstr ""
+msgstr "Pohyb vpřed"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1452
 msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "Klávesy přesunu k navigačním bodům"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
@@ -2410,7 +2631,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:1734 src/gui/setupactiondata.h:1740
 #, c-format
 msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "Zkratka přesunu k bodu %d"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1755
@@ -2420,22 +2641,22 @@ msgstr "Pohyb a výběr"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1785
 msgid "Move Home"
-msgstr ""
+msgstr "Přesun domů"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1791
 msgid "Move End"
-msgstr ""
+msgstr "Přesun End"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1797
 msgid "Page up"
-msgstr ""
+msgstr "Page up"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1803
 msgid "Page down"
-msgstr ""
+msgstr "Page down"
 
 #. TRANSLATORS: input action name
 #. TRANSLATORS: input tab sub tab name
@@ -2443,24 +2664,24 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Ostatní"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1815
 msgid "Select"
-msgstr ""
+msgstr "Vybrat"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1821
 msgid "Select2"
-msgstr ""
+msgstr "Vybrat2"
 
 #. TRANSLATORS: input action name
 #. TRANSLATORS: char select dialog. button.
@@ -2468,78 +2689,77 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Smazat"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1839
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1845
 msgid "Insert"
-msgstr ""
+msgstr "Insert"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1851
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1857
 msgid "Mod"
-msgstr ""
+msgstr "Mod"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1863
 msgid "Ctrl"
-msgstr ""
+msgstr "Ctrl"
 
 #. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1940
 msgid "Basic"
-msgstr ""
+msgstr "Zkladní"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Zkratky"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
-msgstr ""
+msgstr "Okna"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
-msgstr ""
+msgstr "Smajlíci"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1956
 msgid "Gui"
-msgstr ""
+msgstr "Ovládání"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:111
@@ -2549,37 +2769,37 @@ msgstr "Bytost"
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:113
 msgid "Friend names"
-msgstr ""
+msgstr "Jména přátel"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:115
 msgid "Disregarded names"
-msgstr ""
+msgstr "Opovrhovaná jména"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:117
 msgid "Ignored names"
-msgstr ""
+msgstr "Ignorovaná jména"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:119
 msgid "Erased names"
-msgstr ""
+msgstr "Smazaná jména"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:121
 msgid "Other players names"
-msgstr ""
+msgstr "Jména ostatních hráčů"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:123
 msgid "Own name"
-msgstr ""
+msgstr "Vlastní jméno"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:125
 msgid "GM names"
-msgstr ""
+msgstr "Jména GM"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:127
@@ -2588,70 +2808,70 @@ msgstr "Jména NPC"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstra"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:131
 msgid "Monster HP bar"
-msgstr "Pruh HP monster"
+msgstr "Pruh života monster"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:134
 msgid "Monster HP bar (second color)"
-msgstr "Pruh HP monster (druhá barva)"
+msgstr "Pruh života monster (druhá barva)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:136
 msgid "Party members"
-msgstr ""
+msgstr "Členové party"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:138
 msgid "Guild members"
-msgstr ""
+msgstr "Členové gildy"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Částicové efekty"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:142
 msgid "Pickup notification"
-msgstr ""
+msgstr "Upozornění na sebrání"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:144
 msgid "Exp notification"
-msgstr ""
+msgstr "Zkušenostní upozornění"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:146
 msgid "Player HP bar"
-msgstr "Hráčův HP pruh"
+msgstr "Hráčův pruh života"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:150
 msgid "Player HP bar (second color)"
-msgstr "Hráčův HP pruh (druhá barva)"
+msgstr "Hráčův pruh života (druhá barva)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:152
 msgid "Player hits monster"
-msgstr ""
+msgstr "Hráč zasáhl monstrum"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:154
 msgid "Monster hits player"
-msgstr ""
+msgstr "Monstrum zasáhlo hráče"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:158
 msgid "Other player hits local player"
-msgstr ""
+msgstr "Jiný hráč zasáhne místního hráče"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:160
@@ -2661,17 +2881,17 @@ msgstr "Kritický zásah"
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:164
 msgid "Local player hits monster"
-msgstr ""
+msgstr "Místní hráč zasáhne monstrum"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:167
 msgid "Local player critical hit"
-msgstr ""
+msgstr "Kritický zásah místního hráče"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:170
 msgid "Local player miss"
-msgstr ""
+msgstr "Minutí místního hráče"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:172
@@ -2681,395 +2901,331 @@ msgstr "Minutí"
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:174
 msgid "Portal highlight"
-msgstr ""
+msgstr "Zvíraznění portálu"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:177
 msgid "Default collision highlight"
-msgstr ""
+msgstr "Výchozí zvíraznění kolize"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:180
 msgid "Air collision highlight"
-msgstr ""
+msgstr "Zvíraznění vzdušné kolize"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:183
 msgid "Water collision highlight"
-msgstr ""
+msgstr "Zvíraznění vodní kolize"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:186
 msgid "Special ground collision highlight"
-msgstr ""
+msgstr "Speciální zvíraznění pozemní kolize"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:189
 msgid "Walkable highlight"
-msgstr ""
+msgstr "Zvíraznení choditelné plochy"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:192
 msgid "Local player attack range"
-msgstr ""
+msgstr "Útočný dosah místního hráče"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:195
 msgid "Local player attack range border"
-msgstr ""
+msgstr "Okraj zvíraznění útočného dosahu místního hráče"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:198
 msgid "Monster attack range"
-msgstr ""
+msgstr "Útočný dosah monstra"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:202
 msgid "Floor item amount color"
-msgstr ""
+msgstr "Barva počtu předmětů na zemi"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
 msgid "Home place"
-msgstr ""
+msgstr "Domácí místo"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:208
 msgid "Home place border"
-msgstr ""
+msgstr "Okraj domácího místa"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:211
 msgid "Road point"
-msgstr ""
+msgstr "Bod na cestě"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214
 msgid "Tiles border"
-msgstr ""
+msgstr "Okraj dílků"
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
-msgstr ""
+msgstr "Úroveň: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "černá"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "červená"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "zelená"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "modrá"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "zlatá"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "žlutá"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "růžová"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "fialová"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "šedá"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "hnědá"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
-msgstr ""
+msgstr "Ob."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Otevři web adresu"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Upravit"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
-msgstr ""
+msgstr "Úroveň: %d"
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:34
 msgid "Battle"
-msgstr "Bitvy"
+msgstr "Boje"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
-msgstr ""
+msgstr "%s je nyní připojen."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
-msgstr ""
+msgstr "%s se právě odpojil."
 
 #. TRANSLATORS: gb tab name
 #: src/gui/widgets/tabs/gmtab.cpp:31
 msgid "GM"
-msgstr ""
+msgstr "GM"
 
 #. TRANSLATORS: guild chat tab name
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gilda"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
-msgstr ""
-
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
+msgstr "Jazyk"
 
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
-msgstr ""
+msgstr "Základní nastavení"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Zapnout audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Zapnout hudbu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Zapnout zvukové efekty hry"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
-msgstr "Zapnout zvukové efekty gui"
+msgstr "Zapnout zvukové efekty ovládání"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Hlasitost efektů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Hlasitost hudby"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
-msgstr ""
+msgstr "Povolit vytlumení muziky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
-msgstr ""
+msgstr "Frekvence zvuku"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
-msgstr ""
+msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
-msgstr ""
+msgstr "stereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
-msgstr ""
+msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
-msgstr ""
+msgstr "surround+center+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
-msgstr ""
+msgstr "Kanály zvuku"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
-msgstr ""
+msgstr "Zvukové efekty"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
-msgstr ""
+msgstr "Zvuk informačního dialogu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
-msgstr ""
+msgstr "Zvuk požadavkového dialogu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
-msgstr ""
+msgstr "Zvuk šeptané zprávy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
-msgstr ""
+msgstr "Zvuk zprávy Gildy / Party"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
-msgstr ""
+msgstr "Zvuk zvýrazněné zprávy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
-msgstr ""
+msgstr "Zvuk globálního oznámení"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
-msgstr ""
+msgstr "Zvuk chybového oznámení"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
-msgstr ""
+msgstr "Zvuk požadavku na obchod"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Zvuk zobrazení okna"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Zvuk zavření okna"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Povolit mumble hlasový chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
-msgstr "Stahovat hudbu"
+msgstr "Stáhnout hudbu"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:49
 msgid "Window"
-msgstr ""
+msgstr "Okno"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:52
 msgid "Auto hide chat window"
-msgstr ""
+msgstr "Automaticky schovávat okno chatu"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:56
 msgid "Protect chat focus"
-msgstr ""
+msgstr "Chránít zaměření chatu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Barvy"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:64
 msgid "Remove colors from received chat messages"
-msgstr "Odstranit barvy z příchozích zpráv"
+msgstr "Odstranit barvy z příchozích chatových zpráv"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:68
@@ -3114,7 +3270,7 @@ msgstr "Zapnout zaznamenávání konverzace"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:100
 msgid "Enable debug chat Log"
-msgstr ""
+msgstr "Povolit debugový chat?"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:104
@@ -3124,12 +3280,12 @@ msgstr "Zobrazovat historii chatu"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:108
 msgid "Show party online messages"
-msgstr ""
+msgstr "Zobrazit zprávy o připojení party"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid "Show guild online messages"
-msgstr ""
+msgstr "Zobrazit zprávy o připojení gildy"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:117
@@ -3144,7 +3300,7 @@ msgstr "Skrýt obchodní zprávy"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:124
 msgid "Show MVP messages"
-msgstr ""
+msgstr "Zobrazit MVP zprávy"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:129
@@ -3154,7 +3310,7 @@ msgstr "Záložky"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
-msgstr "Všechy šeptání jako záložky"
+msgstr "Všecha šeptání jako záložky"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:136
@@ -3174,17 +3330,17 @@ msgstr "Zapnout obchodní záložku"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
-msgstr ""
+msgstr "Povolit GM záložku"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
-msgstr ""
+msgstr "Povolit záložku jazyka"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
-msgstr ""
+msgstr "Zobrazit zprávy všech jazyků"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:160
@@ -3219,735 +3375,730 @@ msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
-msgstr ""
+msgstr "Globálně ignorovaná jména (oddělená čárkou)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:191
 msgid "Show emotes button in chat"
-msgstr ""
+msgstr "Zobrazit knoflík pro smajlíky v chatu"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:195
 msgid "Show motd server message on start"
-msgstr ""
+msgstr "Zobrazit motto dne od serveru při startu"
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
-msgstr "Takhle to bude vypadat"
+msgstr "Takhle bude barva vypadat"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Prodleva:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Červená:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Zelená:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Modrá:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statický"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulzní"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Duhový"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Průhlednost:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Přiřadit"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Odebrat"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Výchozí"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
-msgstr ""
+msgstr "Resetovat všecky klávesy "
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
-msgstr ""
+msgstr "Vstup"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
-msgstr "Kolize kláves detekovány."
+msgstr "Kolize kláves detekována/y."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
+"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může "
 "chovat podivně."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
-msgstr ""
+msgstr "neznámý"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Stiskněte tlačítko pro zahájení kalibrace"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
-msgstr ""
+msgstr "Detekovat joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Zapnout joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Používat joystick když není aktivní okno klienta"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Zastavit"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
-msgstr ""
+msgstr "Točte s pákou a nemačkejte tlačítka"
 
 #. TRANSLATORS: mods tab in settings
 #: src/gui/widgets/tabs/setup_mods.cpp:41
 msgid "Mods"
-msgstr ""
+msgstr "Mody"
 
 #. TRANSLATORS: settings label
 #: src/gui/widgets/tabs/setup_mods.cpp:76
 msgid "No mods present"
-msgstr ""
+msgstr "Nejsou dostupné žádné modifikace"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
-msgstr ""
+msgstr "Vždy zobrazit"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
-msgstr ""
+msgstr "Automaticky schovat při malém rozlišení"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
-msgstr ""
+msgstr "Vždy automaticky schovávat"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
-msgstr ""
+msgstr "Systémové proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
-msgstr ""
+msgstr "Přímé spojení"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
-msgstr ""
-
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "výchozí"
+msgstr "host SOCKS5"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
-msgstr "nízký"
+msgstr "nízké"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "střední"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
-msgstr ""
+msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
-msgstr "vysoký"
+msgstr "vysoké"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
-msgstr ""
+msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
-msgstr ""
+msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Ostatní"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Zobrazit poškození způsobené monstrům"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Automaticky zaměřovat pouze dosažitelná monstra"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Zvýraznit útočný dosah monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Zobrazit u monster pruh s životy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
-msgstr "Cyklovat zamířená monstra"
+msgstr "Cyklovat zaměřená monstra"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Zvýraznit portály"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Zvýraznit portály na mapách"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Zvýraznit věci na zemi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Zvýraznit hráčův útočný dosah"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Zobrazit rozšířené minimapy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Vykreslovat cestu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Vykreslovat zkratky na mapě"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Zapnout líné rolování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Lenost rolování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Radius rolování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
-msgstr ""
+msgstr "Automaticky měnit velikost minimap"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
-msgstr ""
+msgstr "Zobrazovat animace mapy"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Pohyb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
-msgstr "Automaticky opravovat pozici"
+msgstr "Automaticky upravit pozici"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Útočit během pohybu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Útoč na další cíl"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Synchronizovat hráčův pohyb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Program A šílených pohybů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
-msgstr ""
+msgstr "Pohyby relativní k myši (dobré pro dotyková rozhraní)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
-msgstr "hráč"
+msgstr "Hráč"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Zobrazit vlastní pruh životů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Zapnout rychlé statistiky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
-msgstr "Cyklovat zamířené hráče"
+msgstr "Cyklovat zaměřené hráče"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
-msgstr "Zobrazovat zprávy o pracovních exp"
+msgstr "Zobrazovat zprávy o pracovních zkušenostech"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
-msgstr "Zobrazovat popupy o hráčích"
+msgstr "Zobrazovat bubliny hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Away zpráva"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Zobrazit práci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
-msgstr ""
+msgstr "Povolit filtr útoku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Zapni filtr sběru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
-msgstr ""
+msgstr "Povolit upozorňovací protokol"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
-msgstr ""
+msgstr "Povolit podporu mazlíčků"
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
-msgstr ""
+msgstr "Povolit upozornění na váhu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Obchod"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Akceptovat požadavky na koupi/prodej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Zapnout mód obchodu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Přepínej NPC cíle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Zaznamenávat dialogy s NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Podpora botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
-msgstr ""
+msgstr "Povolit podporu aukčního robota"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Klávesnice"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Zpoždění opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Interval opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
-msgstr ""
+msgstr "Vlastní interval opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
-msgstr ""
+msgstr "Knoflíky zkratek"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
-msgstr ""
+msgstr "Proxy server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
-msgstr ""
+msgstr "Typ proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
-msgstr ""
+msgstr "Proxy adresa:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Povolit útok na straně serveru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
-msgstr ""
+msgstr "Povolit dvojklik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Zapnout ochranu proti vadným serverům (nevypínej)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Zapni OpenGL log"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
-msgstr ""
+msgstr "Povolit záznam vstupu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
-msgstr "Mód nízké síťvé náročnosti"
+msgstr "Mód nízkého síťového provozu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Skrýt zobrazení štítu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
-msgstr ""
+msgstr "Použít FBO pro zachycení obrazovky (pouze pro openGl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
-msgstr ""
+msgstr "Složka pro snímky obrazovky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Zpoždění sítě mezi sub servery"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
-msgstr ""
+msgstr "Vlastní nastavení hustoty obrazovky"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Ne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
-msgstr ""
+msgstr "Lepší výkon (povol pro lepší výkon)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
-msgstr ""
+msgstr "Automaticky nastav výkon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "HW akcelerace"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
+"Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně "
+"paměti) "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Povolit redukci mapy (Softwarově)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
-msgstr ""
+msgstr "Povlit compound sprite delay (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Zapni zpožděné načítání obrázků (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Zapni vzorkovač textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
-msgstr ""
+msgstr "Lepší kvalita (vypněte pro lepší výkon)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Povolit opravu průhlednosti (Softwarově, může být velmi pomalé)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Zobrazit objekty průhledné"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Povolit přeřazení obrázků."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Málo paměti (zapněte pro nízké využití paměti)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Zákázat pokročilé načítání objektů do paměti (Softwarově)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Zakázat načítání oběktů do pamětu (Softwarově)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
-msgstr ""
+msgstr "Různá nastavení (povolení nebo vypnutí pro lepší výkon)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
-msgstr ""
+msgstr "Povolit kompresy textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
-msgstr ""
+msgstr "Povolit rozšíření čtvercové textury (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Požít nový vnitřní formát textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Zapni atlasy textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
+"Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více "
+"paměti)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
+"Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:44
@@ -3967,7 +4118,7 @@ msgstr "Zobrazit vlastní jméno"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Enable extended mouse targeting"
-msgstr ""
+msgstr "Povolit rozšířené zaměřování myší"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:60
@@ -3982,7 +4133,7 @@ msgstr "Viditelná jména"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:68
 msgid "Auto move names"
-msgstr ""
+msgstr "Automaticky posouvat jména"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:72
@@ -4012,7 +4163,7 @@ msgstr "Povolit léčení sebe sama kliknutím myši"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Group friends in who is online window"
-msgstr ""
+msgstr "Řadit přátele v kdo je online dohromady"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:96
@@ -4022,408 +4173,367 @@ msgstr "Skryj postavy smazaných hráčů"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Use special diagonal speed in players moving"
-msgstr ""
+msgstr "Požít speciální diagonální rychlost pro pohyb hráčů"
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Jméno"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
-msgstr "Vztahy"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutrální"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Přítel"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Přehlížený"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorovaný"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Vymazán"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
+msgstr "Vztah"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Povolit šeptání"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Vztahy"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Když ignoruji:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
-msgstr ""
+msgstr "Velmi malé (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Velmi malý (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
-msgstr "Mrňavý (10)"
+msgstr "Velmi malý (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Malý (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Střední (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normální (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Trošku větší (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
-msgstr ""
+msgstr "Velké (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
-msgstr ""
+msgstr "Velké (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
-msgstr ""
+msgstr "Obří (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
-msgstr ""
+msgstr "Obří (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
-msgstr ""
+msgstr "Obří (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
-msgstr ""
+msgstr "Největší (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
-msgstr ""
+msgstr "Největší (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
-msgstr ""
+msgstr "Největší (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
-msgstr ""
+msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Činsky (Čína)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
-msgstr ""
+msgstr "Česky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
-msgstr ""
+msgstr "Anglicky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
-msgstr ""
+msgstr "Finsky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
-msgstr ""
+msgstr "Francouzsky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
-msgstr ""
+msgstr "Německy"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonésky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
-msgstr "Kurzíva"
+msgstr "Italsky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
-msgstr ""
+msgstr "Polsky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
-msgstr ""
+msgstr "Japonsky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holandsk (Belgie/Vlámsky)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
-msgstr ""
+msgstr "Portugalsky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugalsky (Brazílie)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
-msgstr ""
+msgstr "Rusky"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Španělsky (Kastýlie)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
-msgstr ""
+msgstr "Turecky"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
-msgstr "Téma GUI"
+msgstr "Téma ovládání"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Hlavní font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
-msgstr ""
+msgstr "Jazyk"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Tučný font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Font částic"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Pomocný font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Bezpečný font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
-msgstr ""
+msgstr "Písmo pro NPC"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Japonský font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
-msgstr ""
+msgstr "Čínské písmo"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Velikost písma"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Velikost fontu NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
-msgstr ""
+msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
-msgstr ""
+msgstr "Jméno:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
-msgstr ""
+msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Informace o motivu"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normální"
+msgstr "Malé"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
-msgstr ""
+msgstr "Střední"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
-msgstr ""
+msgstr "Velké"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
-msgstr ""
+msgstr "Dotyk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
-msgstr ""
+msgstr "Klávesnice na obrazovce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
-msgstr ""
+msgstr "Zobrazit ikonu klávesnice na obrazovce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
-msgstr ""
+msgstr "Akce ikony klávesnice"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
-msgstr ""
+msgstr "Joystick na obrazovce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
-msgstr ""
+msgstr "Zobrazit joystick na obrazovce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
-msgstr ""
+msgstr "Velikost joysticku"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
-msgstr ""
+msgstr "Tlačítka na obrazovce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
-msgstr ""
+msgstr "Zobrazit tlačítka na obrazovce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
-msgstr ""
+msgstr "Formát tlačítek"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
-msgstr ""
+msgstr "Velikost tlačítek"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
-msgstr ""
+msgstr "Akce tlačítka %u"
 
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:190
@@ -4446,12 +4556,12 @@ msgstr "Altern. FPS omezení:"
 #. TRANSLATORS: video settings button
 #: src/gui/widgets/tabs/setup_video.cpp:201
 msgid "Detect best mode"
-msgstr "Detekuj nejlepší mód"
+msgstr "Detekuj nejlepší režim"
 
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:210
 msgid "Show cursor"
-msgstr ""
+msgstr "Zobrazit kurzor"
 
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:213
@@ -4461,12 +4571,12 @@ msgstr "Vlastní kurzor"
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:217
 msgid "Enable resize"
-msgstr ""
+msgstr "Povolit změnu velikosti"
 
 #. TRANSLATORS: video settings checkbox
 #: src/gui/widgets/tabs/setup_video.cpp:220
 msgid "No frame"
-msgstr ""
+msgstr "Žádný rámeček"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:237
@@ -4530,326 +4640,317 @@ msgstr "Rozlišení obrazovky změněno"
 
 #: src/gui/widgets/tabs/setup_video.cpp:500
 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."
+msgstr "Některá okna mohou být přesunuta aby se vešla do menšího okna."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Bez textu"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bubliny, beze jmen"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bubliny se jmény"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "vypnout"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
-msgstr ""
+msgstr "nejlepší kvalita"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
-msgstr ""
+msgstr "normální"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
-msgstr ""
+msgstr "nejlepší výkon"
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
-msgstr ""
+msgstr "zapnout"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
-msgstr ""
+msgstr "Vizuální"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
-msgstr ""
+msgstr "Škála"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
-msgstr ""
+msgstr "Upozornění"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
-msgstr ""
+msgstr "Zobrazit upozornění na zvednutí v chatu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
-msgstr ""
+msgstr "Zobrazit upozornění na zvednutí jako částicové efekty"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
-msgstr ""
+msgstr "Efekty"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
-msgstr ""
+msgstr "Zachytit myš a vstup z klávesnice"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
-msgstr ""
+msgstr "Rozmazání textur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
-msgstr "Neprůhlednost GUI"
+msgstr "Průhlednost ovládání"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Text nad hlavou"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Efekty prostředí"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
-msgstr "max"
+msgstr "maximální"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detaily částic"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
-msgstr ""
+msgstr "Fyzika částic"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
-msgstr ""
+msgstr "Gama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
-msgstr ""
+msgstr "Povolit nastavení Gama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
-msgstr ""
+msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centruj okno hry"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Povol spuštění spořiče obrazovky"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Kdo je online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
-msgstr ""
+msgstr "POM"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
-msgstr ""
+msgstr "ÚK"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Úkoly"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "OB"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Ověřovač botů"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
-msgstr "KS"
+msgstr "SZ"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Smajlíci"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
-msgstr ""
+msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Stav"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
-msgstr "EQU"
+msgstr "VYB"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Vybavení"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventář"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
-msgstr ""
+msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "DOV"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Dovednosti"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Společenství"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "ZK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "KO"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
-msgstr ""
+msgstr "VŽ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Víte že"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
-msgstr ""
+msgstr "OBCH"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
-msgstr ""
+msgstr "VÝ"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
-msgstr ""
+msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
-msgstr ""
+msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "NAS"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
@@ -4861,72 +4962,32 @@ msgstr "Ověřovač botů"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
-msgstr "Vynulovat"
+msgstr "Resetovat"
 
 #. TRANSLATORS: bot checker window table header
 #: src/gui/windows/botcheckerwindow.cpp:309
 msgid "Result"
 msgstr "Výsledek"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "dle jména"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "dle id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "dle váhy"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "dle množství"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "dle typu"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
-msgstr ""
+msgstr "Vytvořit předměty"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s / Celkem %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
-msgstr ""
+msgstr "Počet:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
@@ -4934,9 +4995,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4946,18 +5007,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -4966,7 +5027,7 @@ msgstr "Vytvořit"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5014,7 +5075,7 @@ msgstr "Emailové adresy nesouhlasí."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Změnit heslo"
 
@@ -5023,7 +5084,7 @@ msgstr "Změnit heslo"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Heslo:"
@@ -5056,17 +5117,17 @@ msgid "The new password entries mismatch."
 msgstr "Nová hesla nesouhlasí."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
-msgstr ""
+msgstr "Nová postava"
 
 #. TRANSLATORS: char create dialog label
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -5074,11 +5135,11 @@ msgstr "Jméno:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5087,134 +5148,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Účes:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
-msgstr ""
+msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Muž"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Žena"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
-msgstr ""
+msgstr "Vzhled:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
-msgstr "Stav postavy je OK"
+msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potvrďte smazání postavy"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete smazat tuto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
-msgstr ""
+msgstr "Účet %s (poslední přihlášení %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Přepnout přihlášení"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Hrát"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
-msgstr "informaceInfo"
+msgstr "Informace"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Změnit email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
-msgstr ""
+msgstr "Účet %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5223,52 +5284,42 @@ msgid ""
 "Experience: %u\n"
 "Money: %s"
 msgstr ""
+"Život: %u/%u\n"
+"Mana: %u/%u\n"
+"Úroveň: %u\n"
+"Zkušenost: %u\n"
+"Peníze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "duhová 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "duhová 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "duhová 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
-msgstr ""
+msgstr "mazlíček patřící %s"
 
 #. TRANSLATORS: confirm dialog button
 #: src/gui/windows/confirmdialog.cpp:55
@@ -5286,201 +5337,201 @@ msgid "Net"
 msgstr "Síť"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Hudba:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Kurzor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Počet částic:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Počet hráčů na mapě:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Pozice hráče:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
-msgstr ""
+msgstr "Draw calls:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
-msgstr ""
+msgstr "Navázání Textur:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
-msgstr ""
+msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
-msgstr ""
+msgstr "%d FPS (normalní OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
-msgstr ""
+msgstr "%d FPS (bezpečné OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
-msgstr ""
+msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
-msgstr ""
+msgstr "%d FPS (SDL2 výchozí)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Počet textur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Počet částic: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Cíl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Id cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
-msgstr ""
+msgstr "Typ cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
-msgstr ""
+msgstr "Úroveň cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
-msgstr ""
+msgstr "Rasa cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
-msgstr ""
+msgstr "Parta cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
-msgstr ""
+msgstr "Gilda cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Prodleva útoku:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Minimální zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Maximální zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Kritický zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Úroveň cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Parta cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Gilda cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Příchozí: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Odchozí: %d bytes/s"
@@ -5498,7 +5549,7 @@ msgstr "< Předchozí"
 #. TRANSLATORS: did you know window button
 #: src/gui/windows/didyouknowwindow.cpp:59
 msgid "Next >"
-msgstr "Další >"
+msgstr "Následující >"
 
 #. TRANSLATORS: did you know window checkbox
 #: src/gui/windows/didyouknowwindow.cpp:61
@@ -5511,130 +5562,130 @@ msgstr "Automaticky otevírat toto okno"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
-msgstr ""
+msgstr "Upravit server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Připojit"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
-msgstr ""
+msgstr "Adresa:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Typ serveru:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
-msgstr ""
+msgstr "Popis:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
-msgstr ""
+msgstr "Url online seznamu:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
-msgstr ""
+msgstr "Prosím zadejte alespoň adresu a port serveru."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
-msgstr ""
+msgstr "Normální písmo"
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
-msgstr ""
+msgstr "Písma"
 
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Did you know..."
-msgstr ""
+msgstr "Věděl jsi že..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Vše"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Vyberte množství předmětů, které chcete obdržet."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Neznámý."
 
 #. TRANSLATORS: kill stats window button
 #: src/gui/windows/killstats.cpp:50
 msgid "Reset stats"
-msgstr "Resetovat statistiky"
+msgstr "Reset statistik"
 
 #. TRANSLATORS: kill stats window button
 #: src/gui/windows/killstats.cpp:52
 msgid "Reset timer"
-msgstr "Reset časomíry"
+msgstr "Reset časů"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:57 src/gui/windows/killstats.cpp:169
 #: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:507
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Zabitých: %s, celkem exp %s"
+msgstr "Zabití: %s, celkem zk %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:60 src/gui/windows/killstats.cpp:171
@@ -5642,7 +5693,7 @@ msgstr "Zabitých: %s, celkem exp %s"
 #: src/gui/windows/killstats.cpp:509
 #, c-format
 msgid "Avg Exp: %s"
-msgstr ""
+msgstr "Prům Zk: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:62 src/gui/windows/killstats.cpp:174
@@ -5650,14 +5701,14 @@ msgstr ""
 #: src/gui/windows/killstats.cpp:512
 #, c-format
 msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Počet prům. oblud do úrovně: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:65 src/gui/windows/killstats.cpp:185
 #: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:515
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr "Zabitých/Min: %s, Exp/Min: %s"
+msgstr "Zabití/Min: %s, Zk/Min: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:74
@@ -5666,23 +5717,23 @@ msgstr "Zabitých/Min: %s, Exp/Min: %s"
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Rychlost Zk za %d min: %s"
+msgstr[1] "Rychlost Zk za %d min: %s"
+msgstr[2] "Rychlost Zk za %d min: %s"
 
 #: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:76
 #: src/gui/windows/killstats.cpp:82
 #, 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] ""
-msgstr[2] ""
+msgstr[0] "Čas do další úrovně při %d min: %s"
+msgstr[1] "Čas do další úrovně při %d min: %s"
+msgstr[2] "Čas do další úrovně při %d min: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:283
 msgid "Last kill exp:"
-msgstr "Exp za poslední zabití:"
+msgstr "Zk za poslední zabití:"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:88 src/gui/windows/killstats.cpp:406
@@ -5695,20 +5746,20 @@ msgstr "Čas do zrození Jack O:"
 #: src/gui/windows/killstats.cpp:119 src/gui/windows/killstats.cpp:236
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr "Úroveň: %d při %f%%"
+msgstr "Úroveň: %d na %f%%"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:241
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr "Exp: %d/%d Zbývá: %d"
+msgstr "Zk: %d/%d Zbývá: %d"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:128 src/gui/windows/killstats.cpp:247
 #: src/gui/windows/killstats.cpp:261
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr "1%% = %d exp, prům. mobů na 1%%: %s"
+msgstr "1%% = %d Zk, prům. oblud na 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:341 src/gui/windows/killstats.cpp:350
@@ -5722,70 +5773,60 @@ msgstr "Čas do další úrovně: %s"
 #: src/gui/windows/killstats.cpp:413
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/windows/killstats.cpp:420
 msgid "jacko spawning"
 msgstr "Jack O se rodí"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Automaticky zavírat"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Přeskočit"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Přihlášení"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
-msgstr "Pamatovat přihlášení"
+msgstr "Pamatovat uživatelské jméno"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Updaty:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Změnit server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrace"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Vlastní host updatů"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
-msgstr ""
+msgstr "Host updatu: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
-msgstr ""
+msgstr "Otevřít registrační url"
 
 #: src/gui/windows/ministatuswindow.cpp:67
 msgid "health bar"
@@ -5809,7 +5850,7 @@ msgstr "pruh váhy"
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:93
 msgid "inventory slots bar"
-msgstr "pruh slotů inventáře"
+msgstr "pruh míst v inventáři"
 
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:97
@@ -5857,20 +5898,20 @@ msgstr "Potřebuješ"
 #: src/gui/windows/ministatuswindow.cpp:384
 #, c-format
 msgid "Job level: %d"
-msgstr ""
+msgstr "Prácovní úroveň: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
-msgstr ""
+msgstr "Zastavit čekání"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -5879,9 +5920,9 @@ msgstr "Odeslat"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Přidat"
 
@@ -5901,7 +5942,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Odeslání se nezdařilo. Odesílatel nebo dopis není platný."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Výstroj: %d"
@@ -5917,40 +5958,40 @@ msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Přepnout server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Přepnout postavu"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Potvrdit:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Jméno musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Jméno musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5958,128 +5999,128 @@ msgstr "Heslo musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Heslo musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
-msgstr ""
+msgstr "prodat předmět"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
-msgstr ""
+msgstr "Opravdu chceš prodat %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Zvolte server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Načíst"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Použít"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Resetovat okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Koupit věci"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Prodat věci"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Oznámit"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Zobrazit odkazy v oznámení"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
-msgstr ""
+msgstr "Aukce"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
@@ -6093,7 +6134,7 @@ msgstr "Zvýšit"
 #: src/gui/windows/skilldialog.cpp:408
 #, c-format
 msgid "Skill points available: %d"
-msgstr "Dovednostních bodů k dispozici: %d"
+msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
 #: src/gui/windows/skilldialog.cpp:468
@@ -6108,294 +6149,294 @@ msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Požadován odchod z gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Člen pozval do gildy"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Koho byste rád pozval do gildy %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Opustit gildu?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
-msgstr ""
+msgstr "Členové: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
-msgstr ""
+msgstr "Hráči: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Parta"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Hráč %s pozván do party."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Odchod z party %s vyžádán."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Přijetí člena do party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Koho chceš pozvat do party %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Opustit partu?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Opravdu chceš opustit partu %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
-msgstr ""
+msgstr "Viditelní hráči: %d"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
-msgstr ""
+msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
-msgstr ""
+msgstr "Portály: %u/%u"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
-msgstr ""
+msgstr "FÚ"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Sb"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Sbírej věci"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignoruj věci"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
-msgstr ""
+msgstr "Přátelé: %u/%u"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
-msgstr ""
+msgstr "H"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
-msgstr ""
+msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Název gildy"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
-msgstr "%s vás pozval ke vstupu do své party."
+msgstr "%s vás pozval ke vstupu do jeho party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Jméno party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:151
 msgid "HP:"
-msgstr ""
+msgstr "BŽ:"
 
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:154
 msgid "Exp:"
-msgstr "Exp:"
+msgstr "Zk:"
 
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:215
 msgid "MP:"
-msgstr ""
+msgstr "MB:"
 
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:258 src/gui/windows/statuswindow.cpp:451
@@ -6420,149 +6461,104 @@ msgstr "Bodů postavy: %d"
 msgid "Correction points: %d"
 msgstr "Opravné body: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Žádný cíl"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr " Povolit zamíření"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Zaměř Cíl"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Obecná magie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magie života"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magie války"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magie přeměn"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magie přírody"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magie hvězd"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Editor příkazů"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "ostatní"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Příkaz:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
-msgstr ""
+msgstr "Komentář:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Typ cíle:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Ikona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Úroveň magie:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Škola magie:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Úroveň školy:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Uložit"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Potvrzeno. Čekám..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Souhlasit s obchodem"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Odsouhlaseno. Čekám..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Obchod: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Dostaneš: %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Změnit"
 
@@ -6572,14 +6568,14 @@ msgid "You give:"
 msgstr "Dáváš:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
-msgstr "Nemáte dost peněz."
+msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Přidání věci selhalo. Nemůžeš přidat jeden druh vícekrát."
+msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:62
@@ -6588,36 +6584,36 @@ msgid "Name: %s"
 msgstr "Jméno: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
-msgstr ""
+msgstr "Zobrazit všecky novinky (může být pomalé)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -6647,57 +6643,57 @@ msgid "Who Is Online - Update"
 msgstr "Kdo je přihlášený - "
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Zvol svět"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Změň přihlášení"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
-msgstr "vyber svět"
+msgstr "Vyber svět"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
-msgstr ""
+msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
-msgstr ""
+msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
-msgstr ""
+msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
-msgstr ""
+msgstr "JK%d"
 
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
-msgstr ""
+msgstr "n kl"
 
 #. TRANSLATORS: inventory type name
 #: src/inventory.cpp:262
 msgid "Storage"
-msgstr "Úložiště"
+msgstr "Sklad"
 
 #. TRANSLATORS: inventory type name
 #: src/inventory.cpp:267
@@ -6707,22 +6703,22 @@ msgstr "Košík"
 #. TRANSLATORS: command line help
 #: src/main.cpp:77
 msgid "manaplus [options] [manaplus-file]"
-msgstr ""
+msgstr "manaplus [možnosti] [soubor-manaplus]"
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:79
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
+msgstr "[soubor-manaplus] : Manaplus soubor je XML soubor (.manaplus)"
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:82
 msgid "                  used to set custom parameters"
-msgstr ""
+msgstr "používá se k nastavení vlastních parametrů"
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:84
 msgid "                  to the manaplus client."
-msgstr ""
+msgstr "pro manaplus klienta."
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:87
@@ -6737,7 +6733,7 @@ msgstr "-l --log-file : Použij logový soubor"
 #. TRANSLATORS: command line help
 #: src/main.cpp:91
 msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "-a --chat-log-dir : Složka uchování záznamu chatu"
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:93
@@ -6782,7 +6778,7 @@ msgstr "-p --port : Přihlaš se k tomuto portu"
 #. TRANSLATORS: command line help
 #: src/main.cpp:110
 msgid "  -H --update-host    : Use this update host"
-msgstr ""
+msgstr "  -H --update-host   : Použít tohoto host pro update"
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:112
@@ -6817,176 +6813,176 @@ msgstr "--safemode : Pro spuštění hry v bezpečném módu"
 #. TRANSLATORS: command line help
 #: src/main.cpp:128
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
+msgstr "-T --tests: Spustit testování ovladačů a automatickou konfiguraci"
 
 #. TRANSLATORS: command line help
 #: src/main.cpp:132
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Síla:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Hbitost:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitalita:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Obratnost:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Štěstí:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
-msgstr ""
+msgstr "Nemohu použít toto ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Neznámá chyba postavy na serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
 "existuje. "
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Nesprávné statistiky."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Nesprávný účes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
-msgstr "Nesprávný slot."
+msgstr "Nesprávný místo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
-msgstr ""
+msgstr "Špatná rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
-msgstr ""
+msgstr "Špatný vzhled."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Postava odstraněna."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Nelze odeslat šeptání, %s není připojen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Nelze odeslat šeptání, %s vás ignoruje."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Hra"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
-msgstr ""
+msgstr "Požadavek na odchod odepřen!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Jméno gildy: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Vedoucí gildy: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Úroveň gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Připojených členů: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
-msgstr ""
+msgstr "Maximálně členů: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Průměrná úroveň: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Zkušenosti gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "Další zkušenosti gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
-msgstr ""
+msgstr "Hrad gildy: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
@@ -7035,386 +7031,389 @@ msgid "Experience sharing unknown."
 msgstr "Stav sdílení zkušeností neznámý."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Účet nenalezen, prosím přihlaste se znovu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Půvoní heslo je nesprávné."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Neregistované ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Platnost účtu vypršela."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
-msgstr "Odmítnut ze serveru."
+msgstr "Odmítnutí od serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+msgstr "Byl jste trvale vyloučen ze hry. Prosím kontaktujte GM team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
-msgstr "Klient je příliš starý."
+msgstr "Klientský software je příliš starý."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
+"Byl jste dočasně vyloučen ze hry do %s.\n"
+"Prosím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Server je přelidněný."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Toto uživatelské jméno je již používáno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
-msgstr ""
+msgstr "Špatný e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
 #. TRANSLATORS: error message
 #: src/net/ea/network.cpp:99
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Byla předána prázdná adresa pro Network::connect()!"
 
 #. TRANSLATORS: error message
 #: src/net/ea/network.cpp:201
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "Nebylo možné vyhledat host \""
 
 #. TRANSLATORS: error message
 #: src/net/ea/network.cpp:280
 msgid "Connection to server terminated. "
-msgstr ""
+msgstr "Spojení se serverem ukončeno."
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Zpráva"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 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é."
+msgstr "Nesete více než polovinu vaší váhy. Regenerace života nyní není možná."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 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é."
+msgstr ""
+"Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Obchod selhal!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Smajlík selhal!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Sednutí selhalo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
-msgstr "Selhalo vytváčení postavy!"
+msgstr "Selhalo vytváření postavy!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Nemůžete vstoupit do party!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Nelze křičet!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Nedostatek životů (HP)!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
-msgstr "Nedostatek many (SP)!"
+msgstr "Nedostatek bodů dovednosti (SP)!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
-msgstr ""
+msgstr "Nemáte žádné zprávy!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
-msgstr "Nyní toto nelze!"
+msgstr "Toto momentálně nemůžete udělat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
-msgstr ""
+msgstr "Potřebujete další rubín!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "Potřebujete další safír!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Eh? Co to je?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
-msgstr ""
+msgstr "Přesun selhal..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Neleze ukrást nic..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Jed nemá žádný účinek..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
-msgstr ""
+msgstr "Síla %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
-msgstr ""
+msgstr "Hbitost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
-msgstr ""
+msgstr "Vitalita %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
-msgstr ""
+msgstr "Inteligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
-msgstr ""
+msgstr "Obratnost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
-msgstr ""
+msgstr "Štěstí %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
-msgstr ""
+msgstr "Ověření selhalo."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
-msgstr ""
+msgstr "Nejsou dostupné žádné servery."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "Někdo jiný se pokouší používat tento účet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
-msgstr ""
+msgstr "Tento účet je již přihlášen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Detekován podvod s rychlostí."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
-msgstr ""
+msgstr "Duplicitní přihlášení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
-msgstr ""
+msgstr "Neznámá chyba připojení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "Byl jsem odpojen od server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Síla"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Hbitost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalita"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Inteligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Obratnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Štěstí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
-msgstr ""
+msgstr "Obrana"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
-msgstr ""
+msgstr "Magický útok"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
-msgstr ""
+msgstr "Magická Obr."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
-msgstr ""
+msgstr "% Přesnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
-msgstr ""
+msgstr "% Uhnutí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
-msgstr ""
+msgstr "% Kritický zásah"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
-msgstr ""
+msgstr "Zpoždění útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
-msgstr ""
+msgstr "Zpoždění chůze"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
-msgstr ""
+msgstr "Dosah útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
-msgstr ""
+msgstr "Poškození za vteř."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
-msgstr ""
+msgstr "%s s tebou chce obchodovat, souhlasíš?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
-msgstr ""
+msgstr "Obchod: Ty a %s"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:131
@@ -7439,23 +7438,23 @@ msgstr "Děkuji za prodej."
 #. TRANSLATORS: notification message
 #: src/notifications.h:143
 msgid "Unable to sell."
-msgstr ""
+msgstr "Není možné prodat."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:146
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Není možné prodávat když obchoduješ."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:149
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "Není možné prodat neprodatelný předmět."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:152
 #, c-format
 msgid "Online users: %d"
-msgstr "připojených uživatel: %d"
+msgstr "Připojených uživatel: %d"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:155
@@ -7470,7 +7469,7 @@ msgstr "Již jste členem gildy."
 #. TRANSLATORS: notification message
 #: src/notifications.h:161
 msgid "Emperium check failed."
-msgstr ""
+msgstr "Kontrola emperia selhala."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:164
@@ -7485,12 +7484,12 @@ msgstr "Opustil jsi gildu."
 #. TRANSLATORS: notification message
 #: src/notifications.h:170
 msgid "Could not invite user to guild."
-msgstr ""
+msgstr "Nebylo možné pozvat uživatele do gildy."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:173
 msgid "User rejected guild invite."
-msgstr "Uživatel zamítl pozvánku do gildy."
+msgstr "Uživatel zamítl pozvání do gildy."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:176
@@ -7505,7 +7504,7 @@ msgstr "Vaše gilda je plná."
 #. TRANSLATORS: notification message
 #: src/notifications.h:182
 msgid "Unknown guild invite response."
-msgstr "Neznámá odpověď na pozváku do gildy."
+msgstr "Neznámá odpověď na pozvání do gildy."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:185
@@ -7516,7 +7515,7 @@ msgstr "%s opustil vaši gildu."
 #. TRANSLATORS: notification message
 #: src/notifications.h:188
 msgid "You were kicked from guild."
-msgstr ""
+msgstr "Byl jste vykopnut z gildy."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:191
@@ -7532,7 +7531,7 @@ msgstr "Pokus o použití předmětu selhal."
 #. TRANSLATORS: notification message
 #: src/notifications.h:197
 msgid "Unable to equip."
-msgstr "Nelze vybavit."
+msgstr "Nelze obléct."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:200
@@ -7547,7 +7546,7 @@ msgstr "Parta úspěšně vytvořena."
 #. TRANSLATORS: notification message
 #: src/notifications.h:206
 msgid "You have left the party."
-msgstr "Odešel jste z party."
+msgstr "Opustil jste partu."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:209
@@ -7565,7 +7564,7 @@ msgstr "%s je již členem vaší party."
 #: src/notifications.h:215
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s zamítl vaši pozvánku."
+msgstr "%s zamítl vaše pozvání."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:218
@@ -7583,7 +7582,7 @@ msgstr "%s nemůže být členem party, jelikož je parta plná."
 #: src/notifications.h:225
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr ""
+msgstr "QQQ Neznámá odpověď na pozvání pro %s."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:246
@@ -7601,7 +7600,7 @@ msgstr "Neznámý člen se snažil říct: %s"
 #: src/notifications.h:252
 #, c-format
 msgid "%s is not in your party!"
-msgstr ""
+msgstr "%s není členem tvojí party!"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:255
@@ -7613,7 +7612,7 @@ msgstr "Sebral jste %s."
 #: src/notifications.h:258
 #, c-format
 msgid "You spent %s."
-msgstr "utratil jste %s."
+msgstr "Utratil jste %s."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:261
@@ -7623,127 +7622,127 @@ msgstr "Nelze zlepšit tuto dovednost!"
 #. TRANSLATORS: notification message
 #: src/notifications.h:264
 msgid "Equip ammunition first."
-msgstr ""
+msgstr "Nejdříve si vem munici."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:267
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr ""
+msgstr "Obchodování s %s není možné. Obchodní partner je příliš daleko."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:271
 #, c-format
 msgid "Trading with %s isn't possible. Character doesn't exist."
-msgstr ""
+msgstr "Obchodování s %s není možné. Postava neexistuje."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:275
 msgid "Trade cancelled due to an unknown reason."
-msgstr ""
+msgstr "Obchod zrušen z neznámého důvodu."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:278
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr ""
+msgstr "Obchod s %s zrušen."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:281
 #, c-format
 msgid "Unhandled trade cancel packet with %s"
-msgstr ""
+msgstr "Neočekávaný packet rušící obchod se %s"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:284
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+msgstr "Přidávání předmětu selhalo. Obchodní partner nese příliš mnoho."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:287
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
+msgstr "Přidání předmětu selhalo. Obchodní partner nemá volné místo."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:290
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
+msgstr "Přidání předmětu selhalo. Není možné obchodovat tento předmět."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:293
 msgid "Failed adding item for unknown reason."
-msgstr ""
+msgstr "Přidání předmětu selhalo z neznámého důvodu."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:296
 msgid "Trade canceled."
-msgstr ""
+msgstr "Obchod zrušen."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:299
 msgid "Trade completed."
-msgstr ""
+msgstr "Obchod dokončen."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:302
 msgid "Kick failed!"
-msgstr ""
+msgstr "Vykopnutí selhalo!"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:305
 msgid "Kick succeeded!"
-msgstr ""
+msgstr "Vykopnutí úspěšné!"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:308
 #, c-format
 msgid "MVP player: %s"
-msgstr ""
+msgstr "MVP hráč: %s"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:311
 msgid "All whispers ignored."
-msgstr ""
+msgstr "Veškeré šeptání ignorováno."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:314
 msgid "All whispers ignore failed."
-msgstr ""
+msgstr "Ignorování veškerého šeptání selhalo."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:317
 msgid "All whispers unignored."
-msgstr ""
+msgstr "Veškeré šeptání odignorováno."
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:320
 msgid "All whispers unignore failed."
-msgstr ""
+msgstr "Odignorování veškerého šeptání selhalo"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:325
 msgid "pvp off, gvg off"
-msgstr ""
+msgstr "pvp vypnuto, gvg vypnuto"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:328
 msgid "pvp on"
-msgstr ""
+msgstr "pvp zapnuto"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:331
 msgid "gvg on"
-msgstr ""
+msgstr "gvg zapnuto"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:334
 msgid "pvp on, gvg on"
-msgstr ""
+msgstr "pvp zapnuto, gvg zapnuto"
 
 #. TRANSLATORS: notification message
 #: src/notifications.h:337
 msgid "unknown pvp"
-msgstr ""
+msgstr "neznámý stav pvp"
 
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:79
@@ -7756,7 +7755,7 @@ msgstr "Softwarový"
 #: src/render/rendererslistsdl2.h:47 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:118
 msgid "SDL2 default"
-msgstr ""
+msgstr "SDL2 výchozí"
 
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:49 src/render/rendererslistsdl2.h:87
@@ -7767,7 +7766,7 @@ msgstr "Mobilní OpenGL"
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:83 src/render/rendererslistsdl.h:80
 msgid "Normal OpenGL"
-msgstr ""
+msgstr "Normální OpenGL"
 
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:85 src/render/rendererslistsdl.h:82
@@ -7781,39 +7780,39 @@ msgstr "Bezpečné OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
-msgstr ""
+msgstr "nepojmenovaný"
 
 #. TRANSLATORS: item info label
 #: src/resources/db/itemdb.cpp:77
 #, c-format
 msgid "Attack %s"
-msgstr ""
+msgstr "Útok %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/db/itemdb.cpp:79
 #, c-format
 msgid "Defense %s"
-msgstr ""
+msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/db/itemdb.cpp:81
 #, c-format
 msgid "HP %s"
-msgstr ""
+msgstr "BŽ %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/db/itemdb.cpp:83
 #, c-format
 msgid "MP %s"
-msgstr ""
+msgstr "BM %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/db/itemdb.cpp:85
 #, c-format
 msgid "Level %s"
-msgstr ""
+msgstr "Úroveň %s"
 
 #. TRANSLATORS: item name
 #: src/resources/db/itemdb.cpp:209
@@ -7823,4 +7822,4 @@ msgstr "Neznámý předmět"
 #. TRANSLATORS: unknown info name
 #: src/resources/db/petdb.cpp:99
 msgid "pet"
-msgstr ""
+msgstr "mazlíček"
diff --git a/po/da.po b/po/da.po
index 4d9db9eb4..0dc016a24 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -20,87 +20,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerer indkomne handels anmodninger"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Opsætning"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Hjælp"
@@ -564,11 +564,11 @@ msgstr "Hjælp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Luk"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -613,83 +613,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Fejl"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Netværksfejl"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Ven"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Se bort fra"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorer"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -996,7 +1217,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Handl"
@@ -1010,49 +1231,49 @@ msgstr "Handl"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Angrib"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1081,7 +1302,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Snak"
@@ -1092,9 +1313,9 @@ msgstr "Snak"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Køb"
 
@@ -1105,9 +1326,9 @@ msgstr "Køb"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Sælg"
 
@@ -1115,26 +1336,26 @@ msgstr "Sælg"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Fortryd"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Brugere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1347,68 +1568,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1417,64 +1638,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Gem på lager"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1482,57 +1703,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Brug"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -1685,22 +1905,22 @@ msgstr "Tag af"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Tag på"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Smid"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Opdel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr "Vælg OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Afslut"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Slet"
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2582,7 +2801,7 @@ msgstr "NPC'er"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstre"
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Penge: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Besked til alle."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Besked fra %s til alle:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Opret en guild"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Lyd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Farver"
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Sådan ser farven ud."
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Fastlåst"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulserende"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Tildel"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Standard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Justering"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stop"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "lav"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "mellem"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "høj"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Kort"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "butik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Navn"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relation"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Ven"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Se bort fra"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorer"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Tillad handel"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Ingen tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bobler uden navne"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bobler med navne"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "deaktiveret"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "maks"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Udstyr"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventarliste"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Færdigheder"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4850,7 +4945,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Nulstil"
 
@@ -4859,61 +4954,21 @@ msgstr "Nulstil"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4923,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4935,18 +4990,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Opret"
 
@@ -4955,7 +5010,7 @@ msgstr "Opret"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
@@ -5012,7 +5067,7 @@ msgstr "Skift adgangskode"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Adgangskode:"
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Navn:"
 
@@ -5063,11 +5118,11 @@ msgstr "Navn:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5076,134 +5131,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Mand"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Kvinde"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Du mangler at fordele %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Du har brugt alle dine points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bekræft sletning af karakter"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakter?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Spil"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Frameld"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil lagre"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5715,62 +5755,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Log Ind"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrer"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5847,17 +5877,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Næste"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Send forespørgsel"
 
@@ -5866,9 +5896,9 @@ msgstr "Send forespørgsel"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Tilføj"
 
@@ -5888,7 +5918,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Kunne ikke sende brevet. Afsender eller brev er ugyldigt."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5904,40 +5934,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Skift server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Skift karakter"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Bekræft:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5945,128 +5975,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Anvend"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Nulstil Vinduer"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Anmodning om byttehandel."
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6095,277 +6125,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Gruppe"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6407,149 +6437,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Foreslå handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Bekræftet. Venter..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Accepter handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Godkendt. Venter..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Ændre"
 
@@ -6559,12 +6544,12 @@ msgid "You give:"
 msgstr "Du giver:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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."
@@ -6576,36 +6561,36 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Updatere..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Udført"
 
@@ -6635,42 +6620,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6813,163 +6798,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7021,58 +7006,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7080,22 +7065,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7115,290 +7100,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Styrke"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Adræthed"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Helbred"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligens"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Behændighed"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Held"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vil gerne handle med dig. Accepterer du?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7768,7 +7753,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unavngivet"
 
diff --git a/po/de.po b/po/de.po
index 1afa96f9e..53a371d3c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -33,87 +33,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Mensch"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -121,387 +121,387 @@ msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben."
 msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "Erfahrungspunkte"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) normale Bewegungen"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) Bewegungen umkehren"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegt sich etwas verrückt"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegt sich verrückt"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) normal + verrückt Bewegen"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) unbekannte Bewegung"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) verrückte Bewegung Nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) verrückte Bewegung"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) bewegt sich normal zum Ziel"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(0) bewegt sich zum Ziel in Distanz 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegt sich zum Ziel in Distanz 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegt sich zum Ziel in Distanz 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegt sich zum Ziel in Distanz 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegt sich zum Ziel in Distanz 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) bewegt sich zum Ziel in Reichweite"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) Bogenschützen Angriffsreichweite"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) bewegt sich zum Ziel in Angriffsreichweite - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) bewegt sich zu jedem Ziel"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) normales Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) relatives Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeltes Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) hinterher Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) unbekannter Folge-Modus"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) wechsel das Angriffslayout ohne Schild"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) wechsel das Angriffslayout mit Schild"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) gehe und greife an"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) gehe, greife an, hebe auf"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) ohne automatischen Angriff"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) kleine aufhebe Zelle 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) normale aufhebe Zelle 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 2x3 Kästchen nach vorne aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3 Kästchen aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) bis Distanz 4 gehen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) bis Distanz 8 gehen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) bis zur maximalen Distanz aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) aufheben"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) Normale Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) Debug Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) Ultra Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) Ultra Kartenansicht 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) Leere Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) Schwarz-Weiß Kartenansicht"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) benutze #flar als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) benutze #chiza als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) benutze #ingrav als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) benutze #frillyar als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) benutze #upmarmu als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) magischer Angriff"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) greife alle Spieler an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) greife alle Spieler, außer Freunde, an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) greife schlechte Beziehungen an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) greife keine Spieler an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) PVP Angriff"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) normale Imitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) Ausrüstungsimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Abwesend"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) spielerverfolgende Kamera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) freie Kamera"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Spielmodifikatoren unbekannt"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -511,42 +511,42 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignoriere komplett"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Drucke '..'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Blinkender Name"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Schwebende '...' Blase"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -558,13 +558,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Hilfe"
@@ -577,11 +577,11 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Schließen"
 
@@ -601,17 +601,17 @@ msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
@@ -626,84 +626,84 @@ msgstr "Charakterserver wechseln"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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..."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
@@ -905,25 +905,25 @@ msgstr "%d Sekunden"
 msgid "Environment variables dumped"
 msgstr "Ausgabe der Umgebungsvariablen"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
@@ -947,65 +947,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "Standard"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "schwarz"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "rot"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "grün"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "blau"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "gold"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "gelb"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "lila"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "grau"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "braun"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "Regenbogen 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "Regenbogen 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "Regenbogen 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Allgemeine Magie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Lebensmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Kriegsmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Verwandlungsmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Naturmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astralmagie"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Freund"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Missachtet"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Gelöscht"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Auf die schwarze Liste gesetzt"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Feind"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "unsortiert"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "nach Preis"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "nach Name"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "nach Id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "nach Gewicht"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "nach Anzahl"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "nach Art"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Kein Ziel"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Ziel erlauben"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Brauche Ziel"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "automatisch schließen"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "überspringen"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Gruppe: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PvP-Rang: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1013,7 +1234,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Handeln"
@@ -1027,49 +1248,49 @@ msgstr "Handeln"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Angriff"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Atombombe"
 
@@ -1087,9 +1308,9 @@ msgstr "Atombombe"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Bewegen"
@@ -1098,7 +1319,7 @@ msgstr "Bewegen"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Sprechen"
@@ -1109,9 +1330,9 @@ msgstr "Sprechen"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1122,9 +1343,9 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -1132,26 +1353,26 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Entferne aus Angriffsliste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Hinzufügen zur bevorzugten Angriffsliste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Hinzufügen zur normalen Angriffsliste"
 
@@ -1159,7 +1380,7 @@ msgstr "Hinzufügen zur normalen Angriffsliste"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Hinzufügen zur Ignorierenliste"
 
@@ -1167,7 +1388,7 @@ msgstr "Hinzufügen zur Ignorierenliste"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
@@ -1190,69 +1411,69 @@ msgstr "Füge Name dem Chat hinzu"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Karteneinstellung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1262,20 +1483,20 @@ msgstr "Umbenennen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Warp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Bewege Kamera"
 
@@ -1284,77 +1505,77 @@ msgstr "Bewege Kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Ausrüstung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Leere Ausrüstungsfenster"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Bearbeite Zauberspruch"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Lösche den Namen nicht"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Lösche Name"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Aktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -1364,68 +1585,68 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Kopiere in die Zwischenablage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Lade zu Gruppe ein"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Name:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Spieler Kommentar"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Kommentar:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Alles zum Handel hinzufügen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -1434,64 +1655,64 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Alles ablegen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Alles aufnehmen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -1499,57 +1720,56 @@ msgstr "Alles abholen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Fächer des Wegwerffensters leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Verstecken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Zeigen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(normal)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Nach oben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Nach unten"
 
@@ -1557,134 +1777,134 @@ msgstr "Nach unten"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Kaufen(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Verkaufen(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Zeige Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1692,9 +1912,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -1702,22 +1922,22 @@ msgstr "Ablegen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Alles fallenlassen"
 
@@ -1725,56 +1945,56 @@ msgstr "Alles fallenlassen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Aufteilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Rauswerfen"
 
@@ -1889,10 +2109,10 @@ msgstr "OK auswählen"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Beenden"
 
@@ -2454,12 +2674,12 @@ msgstr "Seite runter"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Sonstig"
 
@@ -2479,11 +2699,10 @@ msgstr "Auswahl 2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Löschen"
 
@@ -2519,23 +2738,23 @@ msgstr "Normal"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Fenster"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Gefühle"
 
@@ -2543,7 +2762,7 @@ msgstr "Gefühle"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2599,7 +2818,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monster"
 
@@ -2625,7 +2844,7 @@ msgstr "Gildenmitglieder"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
@@ -2759,99 +2978,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "schwarz"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "rot"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "grün"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "blau"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "gold"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "gelb"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "lila"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "grau"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "braun"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "URL öffnen"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Ändern"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2862,30 +3021,30 @@ msgid "Battle"
 msgstr "Kampf"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globale Ansage:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale Ansage von %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ist jetzt Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ist jetzt Offline."
@@ -2899,157 +3058,153 @@ msgstr "GM"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gilde"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Sprache"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(keine Geräusche)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Grundlegende Einstellungen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Audio einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Musik einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Spieltöne einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Nachrichtentöne einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Lautstärke der Musik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Aktiviere Musik Fade-Out"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Tonfrequenz"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "Mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "Stereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "Surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "Surround+Mittig+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Tonkanäle"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Geräuscheffekte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Informationsdialog-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Anfragedialog-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Flüsternachricht-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Gilde/Gruppe-Nachrichten-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Hebe Nachrichtengeräusch hervor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Globale-Nachricht-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Fehlernachricht-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Handelsanfrage-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Fenster-anzeigen-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Fenster-verbergen-Geräusch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "\"mumble voice chat\" einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Lade Musik herunter"
 
@@ -3072,8 +3227,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Farben"
 
@@ -3242,100 +3397,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "So sieht die Farbe aus"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Verzögerung:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Rot:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Grün:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Blau:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsierend"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regenbogen"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Zuordnen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Zurücksetzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Standard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Zürücksetzen aller Tastenbelegungen"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Eingabe"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Wiedersprüchliche Tasteneinstellung(en) entdeckt"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3346,50 +3501,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "unbekannt"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Joysticks erkennen"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Benutze Joystick wenn das Client-Fenster inaktiv ist"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stopp"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Drehe den Joystick und drücke keine Tasten"
 
@@ -3404,279 +3559,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Immer zeigen"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Automatisch ausblenden bei kleiner Auflösung"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Immer Automatisch ausblenden"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "System proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Direkte Verbindung"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "Standard"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "Niedrig"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "Mittel"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "Hoch"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Sonstiges"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Zeige zugefügten Schaden bei Monstern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Nur erreichbare Monster automatisch anvisieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Angriffsbereich vom Monstern anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "HP-Balken von Monster anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Durch die Angriffsziele wechseln"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Karte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Zeige Warp Partikel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Karten Ein- und Ausgänge hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Gegenstände auf dem Boden hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Angriffsbereich des Spielers hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Zeige erweiterte Minikarte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Zeige Pfad"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Zeige Hotkeys auf der Karte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Aktiviere träges Scrollen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Scrollträgheit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Scroll Radius"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Größe der Minimap automatisch anpassen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Bewegt sich"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Automatischen Berichtigen der Position"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Während des Bewegens angreifen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Nächstes Ziel angreifen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Synchronisiere Bewegungen des Spielers"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Verrückte Bewegungen A-Programm"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Mausabhängige Bewegungen (gut für Touch Interfaces)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Spieler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Eigenen HP-Balken anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Aktiviere schnelleres Aufwerten der Spielerattribute"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Angriffsziele des Spielers einkreisen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Zeige \"job exp\"-Nachrichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Zeige Spieler-Popups"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Abwesend Nachricht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Zeige Job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Aktiviere Angriffsfilter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Aufhebefilter aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Aktiviere angezeigtes Protokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Aktiviere Gewichtsbenachrichtigungen"
 
@@ -3684,279 +3829,279 @@ msgstr "Aktiviere Gewichtsbenachrichtigungen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Laden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Verkauf- und Kaufanfragen akzeptieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Laden-Modus einschalten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Durch NPCs blättern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Protokolliere NPC Dialoge"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Bot Unterstützung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Wiederholverzögerung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Wiederholungszeitraum"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "benutzerdefiniertes Wiederholungsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Kurzwahltasten"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Proxy Server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Proxy type"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Proxy address:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Aktiviere Angriff trotz Verzögerung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktiviere Schutz bei fehlerhaften-Servern (nicht deaktivieren)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Debug-Protokoll benutzen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "OpenGL-Log aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Aktiviere Eingabe-Protokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehr Modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Zeige das Schild nicht an"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Benutze FBO für Bildschirmfotos (nur für openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Netzwerkverzögerung zwischen Unterservern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nein"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Hw Beschleunigung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Aktiviere Kartenreduzierung (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Aktivierung Verbindungs-Sprite Verzögerung (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Aktiviere verzögertes Bilderladen (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Aktiviere Textur Sampler (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Aktiviere Alphakanalberichtigung (Software, kann sehr langsam sein)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Zeige die Transperenz von Entitäten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Aktiviere Neuordnung der Sprites."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Kleiner Speicher (aktiviere für niedrigere Speichernutzung)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Deaktiviere erweiterten Wesens-Cache (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Deaktiviere Wesens-Cache (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Aktivierung der rechteckigen Textur-Erweiterung (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Verwenden neue Textur internes Format (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Aktiviere Textur Atlanten (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4037,401 +4182,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Name"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Beziehung"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Freund"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Missachtet"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignoriert"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Gelöscht"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Auf die schwarze Liste gesetzt"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Feind"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Beziehungen"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Sehr klein (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Sehr klein (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Winzig"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Klein"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Mittel"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Groß (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Groß"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Riesig (18)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Chinesisch (China)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Tschechisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Englisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finnisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Französisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Deutsch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonesisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italienisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polnisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japanisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Niederländisch (Belgisch/Flämisch)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portugiesisch (Brasilien)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Russisch"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Spanisch (Kastilisch)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Türkisch"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "GUI Theme"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Hauptschriftart"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Sprache"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Dicke Schrift"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Schrift von Spieleraktionen"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Hilfe Schriftart"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Sichere Schriftart"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Japanische Schrift"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Schriftgröße"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "NPC-Schriftgröße"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Name:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Theme Info"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Klein"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Mittel"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Groß"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Touch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Onscreen Tastatur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Zeige Onscreen Tastatur Icon"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Tastatur-Icon Aktion"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Onscreen Joystick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Zeige Onscreen Joystick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Joystickgröße"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Onscreen Tasten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Zeige Onscreen Tasten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Tastenformat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Tastengröße"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Taste %u Aktion"
@@ -4549,323 +4653,314 @@ msgstr ""
 "anzupassen."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Kein Text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Blasen, keine Namen"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Blasen mit Namen"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "Aus"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "höchste Qualität"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "Normal"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "an"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visuell"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Zeige Aufhebenachrichten im Chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Zeige Aufhebenachrichten als Partikeleffekte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Effekte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Benutze Maus- und Tastatureingaben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Unscharfe Texturen (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Partikeldetail"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Partikeleffekt"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Aktiviere Gamma Control"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Spielfenster zentrieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Erlaube Bildschirmschoner"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Wer ist Online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Aufträge"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BP"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Bot Überprüfer"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "BGS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Besiegte Gegner Statistik"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Similies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Ausrüstung"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventar"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "FÄH"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Special"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOZ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Sozial"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "TK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "ZS"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "WW"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "WS"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Wusstest du schon"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "EINST"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
@@ -4877,7 +4972,7 @@ msgstr "Bot-Prüfer"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -4886,61 +4981,21 @@ msgstr "Zurücksetzten"
 msgid "Result"
 msgstr "Resultat"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "unsortiert"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "nach Preis"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "nach Name"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "nach Id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "nach Gewicht"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "nach Anzahl"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "nach Art"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Menge:"
 
@@ -4950,9 +5005,9 @@ msgstr "Menge:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4962,18 +5017,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Erstellen"
 
@@ -4982,7 +5037,7 @@ msgstr "Erstellen"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5030,7 +5085,7 @@ msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Passwort ändern"
 
@@ -5039,7 +5094,7 @@ msgstr "Passwort ändern"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Passwort:"
@@ -5072,7 +5127,7 @@ msgid "The new password entries mismatch."
 msgstr "Die Passwörter stimmen nicht überein."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Neuer Charakter"
 
@@ -5080,9 +5135,9 @@ msgstr "Neuer Charakter"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Name :"
 
@@ -5090,11 +5145,11 @@ msgstr "Name :"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5103,134 +5158,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Frisur:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Männlich"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Weiblich"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Rasse:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bestätige Löschung des Charakters."
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Login wechseln"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Los!"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Abmelden"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5240,48 +5295,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "Regenbogen 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "Regenbogen 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "Regenbogen 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5302,201 +5342,201 @@ msgid "Net"
 msgstr "Netz"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Musik:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Karte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minikarte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Zeiger:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Partikelanzahl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Anzahl aktiver Mapobjekte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Spielerposition:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Draw calls:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Texturanzahl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikelanzahl: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Ziel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Ziel ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Art des Ziels:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Ziel Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Ziel Rasse:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Ziel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Ziel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Angriffs-Verzögerung:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Minimaler Treffer"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Maximaler Treffer"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Kritischer Treffer"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Ziel Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Ziel Gruppe:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Ziel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Eingehend: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ausgehend: %d bytes/s"
@@ -5527,61 +5567,61 @@ msgstr "Öffne dieses Fenster automatisch"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Bearbeite Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Verbinde..."
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Adresse:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Server Typ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Beschreibung:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5591,47 +5631,47 @@ msgid "Did you know..."
 msgstr "Wusstest Du schon..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du handeln möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände Du aufbewahren möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände Du abholen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Wähle Anzahl der Gegenstände die Du aufteilen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Füge zu Einkaufsladen hinzu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Füge zu Verkaufsladen hinzu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -5744,62 +5784,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "JackO erscheint"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "automatisch schließen"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "überspringen"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Benutzername merken"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Update:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Updateserver verwalten"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Update host: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Öffne die Registrierungs-URL"
 
@@ -5876,17 +5906,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Stoppe Warten"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Absenden"
 
@@ -5895,9 +5925,9 @@ msgstr "Absenden"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -5917,7 +5947,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang, den Brief zu senden oder er war ungültig."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
@@ -5933,40 +5963,40 @@ msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Server wechseln"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-Mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Der Benutzername muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Der Benutzername darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5974,128 +6004,128 @@ msgstr "Das Passwort muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Das Passwort darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "Verkaufe Gegenstand"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Anwenden"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Persönlicher Laden"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Kaufe Dinge"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Verkaufe Dinge"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Teile mit"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Zeige Links in Ankündigung"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
@@ -6124,278 +6154,278 @@ msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s einladen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s Ausstieg angefragt,"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Lade Mitglied in die Gilde ein."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wen willst du in die Gilde %s einladen?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Gilde verlassen?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Gruppe"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s zur Gruppe einladen."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Gruppe %s Auflösung beauftragt."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Lade Mitglied in die Gruppe ein."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen willst du zur Gruppe %s einladen?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Gruppe verlassen?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Gruppe %s verlassen willst?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Bevorzugte Monster"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Greife Monster an"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignoriere Monster"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Gegenstände aufheben"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Gegenstände ignorieren"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe \"%s\""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Gildenname"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Gruppenname"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -6437,149 +6467,104 @@ msgstr "Charakterpunkte: %d"
 msgid "Correction points: %d"
 msgstr "Korrekturpunkte: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Kein Ziel"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Ziel erlauben"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Brauche Ziel"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Allgemeine Magie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Lebensmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Kriegsmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Verwandlungsmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Naturmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Astralmagie"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Kommando Editor"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magisch"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "andere"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Befehl:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Art des Anvisierens:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Magielevel:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Magieschule:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Schul-Level:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Speichern"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Handel: Du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Du bekommst %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Ändern"
 
@@ -6589,12 +6574,12 @@ msgid "You give:"
 msgstr "Du gibst:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
@@ -6607,36 +6592,36 @@ msgid "Name: %s"
 msgstr "Name : %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1 Du versuchst es später erneut."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Fertig"
 
@@ -6666,42 +6651,42 @@ msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Welt wählen"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Login ändern"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Wähle Welt"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6709,7 +6694,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "U-Taste"
 
@@ -6846,166 +6831,166 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "-O --no-opengl : Deaktiviert OpenGL für diese Sitzung"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Stärke:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Beweglichkeit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Gesundheit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Glück:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht verwenden."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Unbekannter Charakterserver Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wurde der Name "
 "schon genommen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Falscher Name."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Falsche Stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Falsche Haare."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Falscher Slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Falsche Rasse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Charakter gelöscht"
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Flüstern konnte nicht gesendet werden, %s ist nicht online."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Konnte nicht flüstern. Ignoriert von %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Spiel"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Verlassen verweigert!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Gildenname: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Gilden Meister: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Gilden Level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Mitglieder Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Mitglieder: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Durchschn. Level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Gilden-EP: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Verbl. Gilden-EP: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Gildenburg: %s"
@@ -7057,58 +7042,58 @@ msgid "Experience sharing unknown."
 msgstr "Erfahrung teilen unbekannt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Altes Passwort fehlerhaft."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Unbekannte ID"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Account abgelaufen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Vom Server abgelehnt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du wurdest für immer gebannt. Bitte kontaktiere das GM-Team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Client zu alt"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7118,22 +7103,22 @@ msgstr ""
 "Bitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Server ist voll."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Dieser Benutzername ist bereits in Verwendung."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Falsche E-Mail-Adresse"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Benutzername für immer gelöscht."
 
@@ -7153,13 +7138,13 @@ msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen."
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Nachricht"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7167,278 +7152,278 @@ msgstr ""
 "Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 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."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Handeln fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Gefühl fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Sitzen fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Chat starten fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Konnte Gruppe nicht beitreten!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Du kannst nicht schreien!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du hast noch ein zu niedriges Level!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Unzureichende HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "Unzureichende SP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Du hast keine Erinnerungen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Das kannst du im Moment nicht machen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Sieht aus, als ob du mehr Geld brauchst....;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Du brauchst ein weiteres rotes Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Du brauchst ein weiteres blaues Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Huh? Was ist das?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Warp fehlgeschlagen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Konnte nichts stehlen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Gift hatte kein Effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Authentifizierung verweigert."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Keine Server verfügbar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Stärke"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Beweglichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Gesundheit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligenz"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Geschicklichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Glück"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Genauigkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ausweichen"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritisch"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Angriffsverzögerung"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Lauf-Verzögerung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Angriffsreichweite"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Schaden pro Sek."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handeln: Du und %s"
@@ -7812,7 +7797,7 @@ msgstr "Sicheres OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unbenannt"
 
diff --git a/po/el.po b/po/el.po
index 7a3b65206..f0a1ea0ba 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "υπευκφυγή"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "αστοχία"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Ρύθμισεις"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Βοήθεια"
@@ -563,11 +563,11 @@ msgstr "Βοήθεια"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr "Μπαίνοντας στον κόσμο του παιχνιδιού "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Αναζητώντας χαρακτήρες"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Σύνδεση με τον διακομιστή του παιχνιδιού"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 
@@ -612,83 +612,83 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Σφάλμα"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Αναζητούνται τα στοιχεία της εγγραφής"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Αλλαγή ηλεκτρονικού ταχυδρομείου"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Ηλεκτρονικό ταχυδρομείο άλλαξε με επιτυχία!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Διαγραφή Επιτυχής"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Αντίο, να επιστρέψεις κάθε στιγμή ..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr " %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί!Έξοδος."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου ενημερώσεων!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Σφάλμα: %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί! Εγκατάλειψη."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Άγνωστη εντολή."
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Γενικά"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Σώσιμο φωτογραφίας απέτυχε"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Η σύνδεση με το διακομιστή χάθηκε."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Σφάλμα δικτύου"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "προεπιλογή"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "μαύρο"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "κόκκινο"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "πράσινο"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "μπλε"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "χρυσό"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "κίτρινο"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "ροζ"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "μωβ"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "γκρί"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "καφέ"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "ουράνιο τόξο 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "ουράνιο τόξο 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "ουράνιο τόξο 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Κανονική"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Αυτόματο Κλείσιμο"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Κόμμα: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Συντεχνία: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Επίθεση"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Κίνηση"
@@ -1080,7 +1301,7 @@ msgstr "Κίνηση"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Συζήτηση"
@@ -1091,9 +1312,9 @@ msgstr "Συζήτηση"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Αγορά"
 
@@ -1104,9 +1325,9 @@ msgstr "Αγορά"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Πουλήστε"
 
@@ -1114,26 +1335,26 @@ msgstr "Πουλήστε"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Προσθήκη στη συζήτηση"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Ρούχα"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Ξόρκια"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Σαφή"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Μετονομασία υπογράψει χάρτη "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Όνομα:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Κατάστημα"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Κατάστημα 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Αποθήκευσε τα μισά"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Αποθηκεύστε όλα τα"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Ανάκτηση"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Ανέκτησε τα μισά"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Ανέκτησε όλα"
 
@@ -1481,57 +1702,56 @@ msgstr "Ανέκτησε όλα"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Χρήση"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Παράβλεψη"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Πέτα ..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Πέτα"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Διαίρεση"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Έξοδος"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Συζήτηση"
 
@@ -2581,7 +2800,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr "μαύρο"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr "κόκκινο"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr "πράσινο"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr "μπλε"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr "χρυσό"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr "κίτρινο"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr "ροζ"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr "μωβ"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr "γκρί"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr "καφέ"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "προεπιλογή"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Αυτόματη στόχος προσιτοί μόνο τέρατα"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Χάρτης"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Κατάστημα"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Δεν"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Όνομα"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Κανονική"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Μερικά παράθυρα μπορούν να μετακινούνται για να ταιριάξει στην χαμηλότερη ανάλυση."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Εξοπλισμός"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Κλειδί: %s"
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Επαναφορά"
 
@@ -4858,61 +4953,21 @@ msgstr "Επαναφορά"
 msgid "Result"
 msgstr "Αποτέλεσμα"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4934,18 +4989,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Δημιουργία"
 
@@ -4954,7 +5009,7 @@ msgstr "Δημιουργία"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
@@ -5011,7 +5066,7 @@ msgstr "Αλλαγή κωδικού πρόσβασης"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -5062,11 +5117,11 @@ msgstr "Όνομα:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5075,134 +5130,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Χρώμα μαλλιών:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Στύλ μαλιών:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Άντρας"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Γυναίκα"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Παρακαλούμε να διανείμετε %d πόντους"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Το όνομά σας πρέπει να είναι τουλάχιστον 4 χαρακτήρες."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Στατιστικά χαρακτηρα:εντάξει"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Παρακαλώ αφαιρέστε %d πόντους"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Επιβεβαίωση Διαγραφή Χαρακτήρα"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Είσαι σίγουρος ότι θέλεις να διαγράψεις αυτό το χαρακτήρα;"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Διακόπτης Σύνδεση"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Αλλαγή Ηλεκτρονικού Ταχυδρομείου"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "ουράνιο τόξο 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "ουράνιο τόξο 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "ουράνιο τόξο 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Ψιθυρίζοντας στο %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "Ναι"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "ΟΚ"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Όλες"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Επιλέξτε το ποσό των στοιχείων για ανταλαγή."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Επιλέξτε το ποσό των στοιχείων για πτώση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Επιλέξτε το ποσό των στοιχείων για αποθήκευση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Επιλέξτε το ποσό των στοιχείων για ανάκτηση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Επιλέξτε το ποσό των στοιχείων για διαιρεση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Άγνωστο."
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Αυτόματο Κλείσιμο"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Είσοδος"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Θυμηθείτε το όνομα χρήστη"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Ενημέρωση:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Αλλαγή διακοσμιτή"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Εγγραφή"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Διακοσμιτής:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Επόμενο"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Υποβολή"
 
@@ -5865,9 +5895,9 @@ msgstr "Υποβολή"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Προσθήκη"
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Επιβεβαίωση:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Ηλεκτρονικό ταχυδρομείο:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Επιλέξε τον διακοσμιτή σου"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Προσωπικό Μαγαζί"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Πουλήστε αντικείμενα"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Εμφάνιση συνδέσμων στις ανακοινώσεις"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 19fbdc54f..392593917 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -20,87 +20,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoring incoming trade requests"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Setup"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Help"
@@ -564,11 +564,11 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Close"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr "Entering game world"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
@@ -613,83 +613,83 @@ msgstr "Changing game servers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Password Change"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Unknown command."
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Network Error"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Friend"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Disregarded"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignored"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -996,7 +1217,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Trade"
@@ -1010,49 +1231,49 @@ msgstr "Trade"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1081,7 +1302,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Talk"
@@ -1092,9 +1313,9 @@ msgstr "Talk"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Buy"
 
@@ -1105,9 +1326,9 @@ msgstr "Buy"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Sell"
 
@@ -1115,26 +1336,26 @@ msgstr "Sell"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Cancel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Players"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1347,68 +1568,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1417,64 +1638,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Store"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Retrieve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1482,57 +1703,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Use"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -1685,22 +1905,22 @@ msgstr "Unequip"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Drop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Split"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr "Select OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Exit"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Delete"
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2582,7 +2801,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Particle effects"
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Global announcement:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Music volume"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Colours"
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Static"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulse"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Rainbow"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Assign"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Default"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibrate"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stop"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "low"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "medium"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "high"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Map"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Shop"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "No"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Name"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relation"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Friend"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Disregarded"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignored"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Allow trading"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Allow whispers"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "When ignoring:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Font size"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "No text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bubbles, no names"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bubbles with names"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "off"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Overhead text"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Skills"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4850,7 +4945,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -4859,61 +4954,21 @@ msgstr "Reset"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4923,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4935,18 +4990,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Create"
 
@@ -4955,7 +5010,7 @@ msgstr "Create"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Change Password"
 
@@ -5012,7 +5067,7 @@ msgstr "Change Password"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Password:"
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Name:"
 
@@ -5063,11 +5118,11 @@ msgstr "Name:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5076,134 +5131,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Male"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Female"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confirm Character Delete"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Play"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Unregister"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "Yes"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "All"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Select amount of items to store."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Select amount of items to retrieve."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5715,62 +5755,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Register"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5847,17 +5877,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Next"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Submit"
 
@@ -5866,9 +5896,9 @@ msgstr "Submit"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Add"
 
@@ -5888,7 +5918,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Failed to send as sender or letter invalid."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5904,40 +5934,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Switch server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Switch character"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Confirm:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5945,128 +5975,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Apply"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6095,277 +6125,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Party"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6407,149 +6437,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Propose trade"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confirmed. Waiting..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Agree trade"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Agreed. Waiting..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Trade: You"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Change"
 
@@ -6559,12 +6544,12 @@ msgid "You give:"
 msgstr "You give:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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."
@@ -6576,36 +6561,36 @@ msgid "Name: %s"
 msgstr "Name: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Updating..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Completed"
 
@@ -6635,42 +6620,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6813,163 +6798,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7021,58 +7006,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7080,22 +7065,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7115,290 +7100,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7768,7 +7753,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unnamed"
 
diff --git a/po/eo.po b/po/eo.po
index 85c3e3017..f9c9c98ba 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,87 +20,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Helpo"
@@ -564,11 +564,11 @@ msgstr "Helpo"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Fermi"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -613,83 +613,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Eraro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr ""
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "nigra"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "ruĝa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "verda"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "blua"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "ora"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "flava"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorita"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Forigita"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Malamiko"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Partio: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -996,7 +1217,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1010,49 +1231,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Sanigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Movi"
@@ -1081,7 +1302,7 @@ msgstr "Movi"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Paroli"
@@ -1092,9 +1313,9 @@ msgstr "Paroli"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1105,9 +1326,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1115,26 +1336,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Nuligi"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Ludantoj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Forlasi"
 
@@ -1347,68 +1568,68 @@ msgstr "Forlasi"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nomo:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1417,64 +1638,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1482,57 +1703,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Uzi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Forigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Malignori"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Sekvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imitado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1685,22 +1905,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Eliri"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Alia"
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Forigi"
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Fenestroj"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Babilado"
 
@@ -2582,7 +2801,7 @@ msgstr "NLR-oj"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstroj"
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr "nigra"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr "ruĝa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr "verda"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr "blua"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr "ora"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr "flava"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr "Batalo"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Koloroj"
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Speco:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Ruĝa:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Verda:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Blua:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Halti"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Ludanta"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Montri laboro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NLR"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Klavaro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Ne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nomo"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorita"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Forigita"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Malamiko"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Rilatoj"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Lingvo"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Teksto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Efektoj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4850,7 +4945,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4859,61 +4954,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Kvanto:"
 
@@ -4923,9 +4978,9 @@ msgstr "Kvanto:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4935,18 +4990,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Krei"
 
@@ -4955,7 +5010,7 @@ msgstr "Krei"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5012,7 +5067,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -5063,11 +5118,11 @@ msgstr "Nomo:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5076,134 +5131,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Har-koloro:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Iĉa"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Ina"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Ludi"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "Jes"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr "Celo"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr "Reto"
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Adreso:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Servilo-speco:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Nekonata."
 
@@ -5715,62 +5755,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Ensaluti"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Servilo:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5847,17 +5877,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5866,9 +5896,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Aldoni"
 
@@ -5888,7 +5918,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5904,40 +5934,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Retadreso:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5945,128 +5975,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6095,277 +6125,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Partio"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Krei partion"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Partio-nomo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6407,149 +6437,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magio"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "alia"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Manao:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Vi ricevas %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6559,12 +6544,12 @@ msgid "You give:"
 msgstr "Vi donas:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6576,36 +6561,36 @@ msgid "Name: %s"
 msgstr "Nomo: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6635,42 +6620,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Elekti mondon"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6813,163 +6798,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Forto:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Rapideco:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Lerteco:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Nekorekta nomo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Nekorekta haro."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7021,58 +7006,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Nekonata eraro."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7080,22 +7065,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7115,290 +7100,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Forto"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Rapideco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Lerteco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7768,7 +7753,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sennoma"
 
diff --git a/po/es.po b/po/es.po
index d41459b4e..1105d284d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -29,87 +29,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "evade"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,387 +117,387 @@ msgstr[0] "Recogiste un %d [@@%d|%s@@]."
 msgstr[1] "Recogiste unos %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "xp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) moverse por defecto"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) moverse de forma invertida"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos alocados"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos alocados"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimiento loco número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) movimiento loco personalizado"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) movimiento loco"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse  al objetivo en distancia 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) moverse al objetivo en el rango de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(b) moverse al blanco en rango de ataque - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) moverse al objetivo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) seguir como mascota"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) ataque por defecto"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) intercambiar ataque con escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger hacia adelante a 2x3 celdas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger hasta 3x3 celdas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) vista de depuración del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) vista extremista del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) vista extremista 2 del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) atacar a todos, excepto a amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) no atacar a los jugadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de vestimenta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Fuera del Teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) afuera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -507,42 +507,42 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Burbuja flotante"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr "Rendimiento"
 
@@ -554,13 +554,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ayuda"
@@ -573,11 +573,11 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Cerrar"
 
@@ -597,17 +597,17 @@ msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -622,83 +622,83 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Servidor de actualización inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
@@ -900,25 +900,25 @@ msgstr "%d segundos"
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -942,65 +942,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Error de Red"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "predeterminado"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "negro"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "rojo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "verde"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "azul"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "dorado"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "amarillo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "púrpura"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "gris"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "marrón"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "arco iris 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "arco iris 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "arco iris 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Magia General"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magia de Vida"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magia de Guerra"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magia de Transmutación"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magia de la Naturaleza"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Magia Astral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Amigo"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Desatendido"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Borrado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "En la lista negra"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Enemigo"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "desordenado"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "por precio"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "por nombre"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "por id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "por peso"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "por cantidad"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "por tipo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Ningún objetivo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Permitir objetivo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Necesita objetivo"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Cerrar automáticamente"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Saltar"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gremio: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Rango PvP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1008,7 +1229,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Intercambio"
@@ -1022,49 +1243,49 @@ msgstr "Intercambio"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Eliminar"
 
@@ -1082,9 +1303,9 @@ msgstr "Eliminar"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Mover"
@@ -1093,7 +1314,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Hablar"
@@ -1104,9 +1325,9 @@ msgstr "Hablar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1117,9 +1338,9 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Vender"
 
@@ -1127,26 +1348,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Agregar comentario"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
@@ -1154,7 +1375,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -1162,7 +1383,7 @@ msgstr "Agregar a la lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
@@ -1185,69 +1406,69 @@ msgstr "Agregar nombre al chat"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -1257,20 +1478,20 @@ msgstr "Renombrar"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Deformar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Mover cámara"
 
@@ -1279,77 +1500,77 @@ msgstr "Mover cámara"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Dejar"
 
@@ -1359,68 +1580,68 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nombre:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -1429,64 +1650,64 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -1494,57 +1715,56 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Limpiar ventana de lanzamiento"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(predeterminado)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Bajar"
 
@@ -1552,134 +1772,134 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Mostrar ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imitación"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr "Proteger artículo"
 
@@ -1687,9 +1907,9 @@ msgstr "Proteger artículo"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -1697,22 +1917,22 @@ msgstr "Quitárselo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -1720,56 +1940,56 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Expulsar"
 
@@ -1866,7 +2086,7 @@ msgstr "Habilitar/Deshabilitar intercambios"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:165
 msgid "Open trade window"
-msgstr ""
+msgstr "Abrir ventana de intercambio"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:171
@@ -1884,10 +2104,10 @@ msgstr "Seleccionar OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Salir"
 
@@ -2449,12 +2669,12 @@ msgstr "Page down"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Otro"
 
@@ -2474,11 +2694,10 @@ msgstr "Select2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Borrar"
 
@@ -2514,23 +2733,23 @@ msgstr "Basico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Atajos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Ventanas"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Emotes"
 
@@ -2538,7 +2757,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2594,7 +2813,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstruos"
 
@@ -2620,7 +2839,7 @@ msgstr "Miembros del gremio"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
@@ -2754,99 +2973,39 @@ msgstr "Punto de recorrido"
 msgid "Tiles border"
 msgstr "Borde de tiles"
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Nivel: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "negro"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "rojo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "verde"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "azul"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "dorado"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "amarillo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "púrpura"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "gris"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "marrón"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Abrir url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -2857,30 +3016,30 @@ msgid "Battle"
 msgstr "Batalla"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Anuncio global:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anuncio global de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s susurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ahora está Conectado."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ahora está Desconectado."
@@ -2894,157 +3053,153 @@ msgstr "GM"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gremio"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Lenguaje"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(sin sonido)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Configuraciones básicas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Habilitar Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Habilitar música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Habilitar efectos de sonido del juego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Habilitar efectos de sonido de la interfaz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volumen de efectos de sonido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volumen de música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Habilitar desvanecimiento en la música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Frequencia de Audio"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "Estereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "surround+center+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Canales de Audio"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Efectos de sonido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Sonido de diálogo de información"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Sonido de diálogo de petición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Sonido de susurro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Sonido de mensajes de Gremio / Grupo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Sonido de mensaje resaltado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Sonido de mensaje global"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Sonido de mensaje de error"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Sonido de petición de intercambio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Mostrar ventana de sonido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Ocultar ventana de sonido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Habilitar el chat de voz de mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Descargar música"
 
@@ -3067,8 +3222,8 @@ msgstr "Proteger foco del chat"
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Colores"
 
@@ -3238,100 +3393,100 @@ msgstr "Mostrar botón de emoticonos en el chat"
 msgid "Show motd server message on start"
 msgstr "Mostrar el mensaje motd del servidor al iniciar"
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Así es como luce este color"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Retraso:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Rojo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Verde:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Azul:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Arco iris"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Asignar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Predeterminado"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Restablecer todas las teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Detectado conflicto de teclas."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3342,50 +3497,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "Desconocido"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Detectar palancas de mando"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Habilitar la palanca de mando"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Usar la palanca de mando si la ventana del cliente está inactiva"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Palanca de Mando"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Parar"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Girar la palanca y no presionar los botones"
 
@@ -3400,279 +3555,269 @@ msgid "No mods present"
 msgstr "No hay mods presentes"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Siempre mostrar"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Ocultar automáticamente en resoluciones pequeñas"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Siempre auto hide"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Proxy del Sistema"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Conexion directa"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "predeterminado"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "bajo"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "medio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Misceláneo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Resaltar el rango de ataque de los monstruos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de PV del monstruo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Mostrar partículas de portales"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Resaltar los los artículos el suelo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Resaltar el rango de ataque del jugador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Mostrar mini-mapas extendidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Dibujar trayectoria"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Dibujar teclas de acceso rápido en el mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Habilitar desplazamiento perezoso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Pereza al desplazarse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Radio de desplazamiento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Auto-redimensionar minimapas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr "Reproducir animaciones del mapa"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "En movimiento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Corregir posición automáticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Atacar siguiente objetivo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Sincronizar movimiento del jugador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Movimientos relativos del ratón (bueno para interfaces táctiles)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Mostrar barra de PV propia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Apuntar cíclicamente los jugadores, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Mostrar mensajes de experiencia de trabajo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Mensaje afk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de recogido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr "Soporte para mascotas habilitado"
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Habilitar notificaciones de peso"
 
@@ -3680,284 +3825,284 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Tienda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra/venta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 "Seleccionar cíclicamente los npcs en derredor, no necesariamente al más "
 "cercano"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Registrar diálogos de NPCs"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Soporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Habilitar soporte para el bot 'AuctionBot'"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Retraso en repetición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Intervalo de repetición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetición personalizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Atajos"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Proxy Server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Tipo de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Dirección de proxy:puerto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr "Habilitar doble clics"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Habilitar inspector de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Habilitar registro OpenGl"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Habilitar registro de entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr "Directorio de capturas de pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Retraso de red entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Mostrar fondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Sobrescribir densidad de pantalla"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "No"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr "El mejor rendimiento (habilitar para mejor desempeño)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr "Ajustar el rendimiento automáticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Aceleración por hardware"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Habilitar reducción de mapa (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Habilirar composición de retraso de sprite (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Habilitar carga de imágenes retardadas  (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Habilitar muestreo de texturas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr "Mejor calidad (deshabilitar para un mejor desempeño)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia de criaturas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Habilitar re-ordenamiento de sprites."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Poca memoria (permite un uso más bajo de memoria)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Deshabilitar caché avanzado de criaturas (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Deshabilitar caché de criaturas (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr "Habilitar compresión de texturas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Habilitar extensiones de textura rectangulares (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Usar nuevo formato de textura interna (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Habilitar atlas de texturas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 "Almacenar en cache todos los sprites por mapa (puede usar memoria adicional)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Almacenar en caché todos los sonidos (puede usar memoria adicional)"
 
@@ -4038,401 +4183,360 @@ msgstr "Usar velocidad diagonal especial en movimiento de jugadores"
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nombre"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relación"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Amigo"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Desatendido"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Borrado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "En la lista negra"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Enemigo"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Permitir intercambios"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relaciones"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Muy pequeño (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Muy pequeño (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Extenso (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Extenso (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Extenso (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Grande (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Grande (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Grande (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Muy grande (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Muy grande (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Muy grande (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Chino (China)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Checo"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Inglés"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finlandés"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Francés"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Alemán"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonesio"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polaco"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japonés"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holanda (Bélgica/Flandes)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portugués"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portugués (Brasileño)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Ruso"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Español (Castellano)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Turco"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Tema de la interfaz gráfica"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Fuente principal"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Fuente negrita"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Fuente segura"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr "Fuente de NPC"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Fuente japonesa"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr "Fuente china"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Tamaño de letra en NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Nombre: "
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Info del tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el cliente para que los cambios surtan efecto."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Pequeño"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Mediano"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Grande"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Táctil"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Teclado en pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Mostrar ícono del teclado en pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Acción del ícono del teclado"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Palanca de mando en pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Mostrar la palanca de mando (joystick) en la pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Tamaño de la palanca de mando"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Botones en pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Mostrar botones en pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Formato de los botones"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Tamaño del Botón "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Acción del botón %u"
@@ -4547,323 +4651,314 @@ msgstr ""
 "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Sin texto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Texto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Burbujas sin nombres"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Burbujas con nombres"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "apagado"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "Mejor Calidad"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "Normal"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr "mejor rendimiento"
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "on"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr "Escala"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Notificaciones"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Mostrar notificaciones en el chat al recoger"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Mostrar notificaciones como efecto de partículas al recoger"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Efectos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Sostener el enfoque del teclado y el ratón dentro de la ventana"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Texturas Borrosas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Opacidad de interfaz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Efectos de ambiente"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detalle de partícula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Particle physics"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Habilitar control gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centrar ventana del juego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Permitir ejecución de protector de pantalla"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Quién está conectado"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Misiones"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Inspector de bot"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Emotíconos"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Estado"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipamiento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Habilidades"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Especiales"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -4875,7 +4970,7 @@ msgstr "Inspector de Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -4884,61 +4979,21 @@ msgstr "Restablecer"
 msgid "Result"
 msgstr "Resultado"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "desordenado"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "por precio"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "por nombre"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "por id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "por peso"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "por cantidad"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "por tipo"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr "Crear artículos"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Cantidad:"
 
@@ -4948,9 +5003,9 @@ msgstr "Cantidad:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4960,18 +5015,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Crear"
 
@@ -4980,7 +5035,7 @@ msgstr "Crear"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5032,7 +5087,7 @@ msgstr "Las direcciones de correo suministradas no concuerdan."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
@@ -5041,7 +5096,7 @@ msgstr "Cambiar contraseña"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Contraseña:"
@@ -5074,7 +5129,7 @@ msgid "The new password entries mismatch."
 msgstr "Las contraseñas nuevas ingresadas no concuerdan."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Nuevo Personaje"
 
@@ -5082,9 +5137,9 @@ msgstr "Nuevo Personaje"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -5092,11 +5147,11 @@ msgstr "Nombre:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5105,134 +5160,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Color de cabello:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Peinado:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Masculino"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Femenino"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Raza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr "Apariencia:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confirmar la eliminación del personaje"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Estás seguro de que deseas borrar este personaje?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Cuenta %s (fecha de último inicio %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Volver al Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Jugar"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Información"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Cambiar correo"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Cuenta %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5247,48 +5302,33 @@ msgstr ""
 "Experiencia: %u\n"
 "Dinero: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "arco iris 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "arco iris 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "arco iris 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr "Mascota de %s"
@@ -5309,201 +5349,201 @@ msgid "Net"
 msgstr "Red"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Cursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Recuento de partículas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Numero de agentes en el mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Posición del jugador:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Dibujar llamadas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr "Enlaces de texturas:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (OpenGL normal)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (OpenGL seguro)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (OpenGL móvil)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 predeterminado)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Contador de Texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Recuento de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Id de Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Tipo de objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Nivel del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Raza del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Grupo de objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Gremio del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Retraso de ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Golpe mínimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Golpe máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Golpe crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Nivel del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Grupo del Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Gremio del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Recibiendo: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
@@ -5534,62 +5574,62 @@ msgstr "Abrir automáticamente esta ventana"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Dirección:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Puerto:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Descripción:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "URL de lista de conectados:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr "Fuente normal"
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr "Fuentes"
 
@@ -5599,47 +5639,47 @@ msgid "Did you know..."
 msgstr "¿Sabías que..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Todo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Selecciona la cantidad de artículos a intercambiar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de artículos a tirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Seleccione la cantidad de artículos a recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de artículos."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Agregar tienda (compra)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Agregar a la tienda (venta)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -5750,62 +5790,52 @@ msgstr "¿%s %d?"
 msgid "jacko spawning"
 msgstr "jacko apareciendo"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Cerrar automáticamente"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Saltar"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Actualizar:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Host de actualización: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Abrir registro de url"
 
@@ -5882,17 +5912,17 @@ msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5901,9 +5931,9 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Añadir"
 
@@ -5923,7 +5953,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Vestimenta: %d"
@@ -5939,34 +5969,34 @@ msgid "Away outfit"
 msgstr "Vestimenta AFK"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Cambiar de servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Cambiar de personaje"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Correo:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 "El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
@@ -5974,7 +6004,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5982,128 +6012,128 @@ msgstr "La contraseña necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "La contraseña necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "vender artículo"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "¿Realmente quieres vender %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Cargar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Usar la misma ip para los subservidores del juego"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Descargando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "requiere una versión más nueva"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Aplicar"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Comprar artículos"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Vender artículos"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Anunciar"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en el anuncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Subasta"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
@@ -6132,277 +6162,277 @@ msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Jugador %s invitado al gremio %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gremio %s pidiendo salir."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Miembro invitado al Gremio."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "¿A quién te gustaría invitar al gremio %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "¿Dejar el gremio?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el gremio %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Miembros: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Jugadores: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grupo"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Renuncia al grupo %s solicitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "¿A quién te gustaría invitar al grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr "Jugadores visibles: %d"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portales: %u/%u"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Recoger Items"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignorar Items"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Amigos: %u/%u"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Crear grupo"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando gremio llamado %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nombre del Gremio"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu gremio."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del gremio, pero ya existe uno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado a unirte al gremio %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al gremio"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe uno."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Has sido invitado a unirte un grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear el grupo; ya estás en uno."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Escoge el nombre de tu grupo."
 
@@ -6444,149 +6474,104 @@ msgstr "Puntos del personaje: %d"
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Ningún objetivo"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Permitir objetivo"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Necesita objetivo"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Magia General"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magia de Vida"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magia de Guerra"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magia de Transmutación"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magia de la Naturaleza"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magia Astral"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Editor de comando"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "otro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Símbolo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Ícono:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Maná:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Nivel de magia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Escuela de magia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Nivel de escuela:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Guardar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Proponer el intercambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Esperando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Aceptar intercambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Aceptado. Esperando..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Cambiar"
 
@@ -6596,12 +6581,12 @@ msgid "You give:"
 msgstr "Tú das:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
@@ -6614,36 +6599,36 @@ msgid "Name: %s"
 msgstr "Nombre: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Actualizando..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas las noticias (puede ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 El proceso de actualización está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Se recomienda encarecidamente que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Completado"
 
@@ -6673,42 +6658,42 @@ msgid "Who Is Online - Update"
 msgstr "Quién está conectado - Actualizar"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Seleccionar Mundo"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Cambiar de Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Escoger Mundo"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6716,7 +6701,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla desc."
 
@@ -6852,165 +6837,165 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Fuerza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agilidad:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Suerte:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
 "servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Imposible usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Falla char-server desconocida."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Estadísticas incorrectas."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Cabello incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Ranura incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Raza incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr "Apariencia incorrecta."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Personaje borrado."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Juego"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "¡Petición de salida denegada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nombre del gremio: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Maestro del gremio: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nivel del gremio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Miembros conectados: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Máx. Miembros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Nivel promedio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Experiencia del gremio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Experiencia siguiente del gremio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castillo del gremio: %s"
@@ -7062,47 +7047,47 @@ msgid "Experience sharing unknown."
 msgstr "Compartir experiencia desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Contraseña anterior incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Error desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7110,12 +7095,12 @@ msgstr ""
 "equipo de GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Cliente es demasiado antiguo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7125,22 +7110,22 @@ msgstr ""
 "Por favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "E-mail incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
@@ -7160,13 +7145,13 @@ msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Mensaje"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7174,278 +7159,278 @@ msgstr ""
 "salud."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 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."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "¡Fallo al intercambiar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "¡Fallo al hacer un emoticono!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "¡Fallo al sentarse!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "¡Fallo al crear un chat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "¡No se puede unir al grupo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "¡Imposible gritar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "¡PV insuficientes!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "¡SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "¡No tienes ningún memo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "¡No puedes hacer esto ahora mismo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "¡Necesitas otra gema roja!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "¡Necesitas otra gema azul!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "¡Estás llevando muchas cosas para hacer esto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Huh? Qué es eso?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Warp fallido..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "No puedes robar nada..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Veneno no tuvo ningún efecto..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr "Fuerza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencia %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr "Suerte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Autenticación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "No hay servidores disponibles."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Alguien más está tratando de usar esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Ya hay alguien conectado con esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Speed hack detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Inicio de sesión duplicada."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Fuerza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agilidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Inteligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Suerte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Defensa M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Retraso de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Retraso de Marcha"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Rango de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Daño por segundo"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quiere realizar un intercambio contigo, ¿aceptas?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Intercambio: Tú y %s"
@@ -7815,7 +7800,7 @@ msgstr "OpenGL Seguro"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anónimo"
 
diff --git a/po/et.po b/po/et.po
index bd7027832..7306089cc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Abi"
@@ -563,11 +563,11 @@ msgstr "Abi"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Sulge"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Viga"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr ""
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1091,9 +1312,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1104,9 +1325,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1114,26 +1335,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr ""
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Vestlus"
 
@@ -2581,7 +2800,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Raha: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Ei"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4858,61 +4953,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr ""
 
@@ -4954,7 +5009,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5011,7 +5066,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr ""
 
@@ -5062,11 +5117,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Mees"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Naine"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "Jah"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Järgmine"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5865,9 +5895,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "Nimi: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 653e9f128..d374e3230 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,474 +19,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -496,42 +496,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -543,13 +543,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -562,11 +562,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -586,17 +586,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,83 +611,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "خطا"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "چنین دستور وجود ندارد"
 
@@ -887,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -928,65 +928,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "کلی"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "خطای شبکه"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -994,7 +1215,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1008,49 +1229,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1068,9 +1289,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1079,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1090,9 +1311,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1103,9 +1324,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1113,26 +1334,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1140,7 +1361,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1148,7 +1369,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1171,69 +1392,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "انصراف"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1243,20 +1464,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1265,77 +1486,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1345,68 +1566,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1415,64 +1636,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1480,57 +1701,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1538,134 +1758,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1673,9 +1893,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1683,22 +1903,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1706,56 +1926,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1870,10 +2090,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "خروج"
 
@@ -2435,12 +2655,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2460,11 +2680,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "حذف"
 
@@ -2500,23 +2719,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2524,7 +2743,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "چت"
 
@@ -2580,7 +2799,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2606,7 +2825,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2740,99 +2959,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2843,30 +3002,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2880,157 +3039,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3053,8 +3208,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3223,100 +3378,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3325,50 +3480,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3383,279 +3538,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3663,279 +3808,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4016,401 +4161,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4520,323 +4624,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "تجهیزات"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4848,7 +4943,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4857,61 +4952,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4921,9 +4976,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4933,18 +4988,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "بساز"
 
@@ -4953,7 +5008,7 @@ msgstr "بساز"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5001,7 +5056,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "تغییر گذرواژه"
 
@@ -5010,7 +5065,7 @@ msgstr "تغییر گذرواژه"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "گذرواژه:"
@@ -5043,7 +5098,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5051,9 +5106,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "نام"
 
@@ -5061,11 +5116,11 @@ msgstr "نام"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5074,134 +5129,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "مرد"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "زن"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "تایید می کنم که خواهان حذف این شخصیت هستم"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "آیا اطمینان دارید که خواهان حذف این شخصیت هستید؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "ثبت نام نشده"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5211,48 +5266,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,12 +5303,12 @@ msgid "Yes"
 msgstr "بلی"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5498,61 +5538,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "تایید"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5562,47 +5602,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5711,62 +5751,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5843,17 +5873,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "بعدی"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5862,9 +5892,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5884,7 +5914,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5900,40 +5930,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5941,128 +5971,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6091,277 +6121,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6403,149 +6433,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6555,12 +6540,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6572,36 +6557,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6631,42 +6616,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6674,7 +6659,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6809,163 +6794,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7017,58 +7002,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7076,22 +7061,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7111,290 +7096,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7764,7 +7749,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 3ed26772c..ccc2b7aaa 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: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -21,87 +21,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "-"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -109,387 +109,387 @@ msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Poissa"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) poissa"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -499,42 +499,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Tulosta '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Vilkuta nimeä"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Leijuva '...' -puhekupla"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -546,13 +546,13 @@ msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Apua"
@@ -565,11 +565,11 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Sulje"
 
@@ -589,17 +589,17 @@ msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -614,83 +614,83 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
@@ -892,25 +892,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -935,65 +935,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "oletus"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "musta"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "punainen"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "vihreä"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "sininen"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "kulta"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "keltainen"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "vaaleanpunainen"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "violetti"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "harmaa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "ruskea"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "sateenkaari 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "sateenkaari 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "sateenkaari 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Yleismagia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Elämämagia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Sotamagia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Muovausmagia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Luontomagia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astraalimagia"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutraali"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Ystävä"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Vaimennettu"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Huomiotta jätetty"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Pyyhitty"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Mustalla listalla"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Vihollinen"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "nimi"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "paino"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "määrä"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "tyyppi"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Ei kohdetta"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Salli kohde"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Tarvitsee kohteen"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Oletus"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Sulje kun valmis"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Ohita"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Ryhmä: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Kilta: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentti: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
@@ -1001,7 +1222,7 @@ msgstr "Paino: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Tee kaupat"
@@ -1015,49 +1236,49 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Hyökkää"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Pommita"
 
@@ -1075,9 +1296,9 @@ msgstr "Pommita"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Liiku"
@@ -1086,7 +1307,7 @@ msgstr "Liiku"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Keskustele"
@@ -1097,9 +1318,9 @@ msgstr "Keskustele"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Osta"
 
@@ -1110,9 +1331,9 @@ msgstr "Osta"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Myy"
 
@@ -1120,26 +1341,26 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
@@ -1147,7 +1368,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -1155,7 +1376,7 @@ msgstr "Lisää ohitettavien listaan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
@@ -1178,69 +1399,69 @@ msgstr "Lisää nimi keskusteluun"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Peru"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Karttaolio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -1250,20 +1471,20 @@ msgstr "Nimeä uudelleen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1272,77 +1493,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Eroa"
 
@@ -1352,68 +1573,68 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -1422,64 +1643,64 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -1487,57 +1708,56 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(oletus)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -1545,134 +1765,134 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Matki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1680,9 +1900,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -1690,22 +1910,22 @@ msgstr "Poista varuste käytöstä"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -1713,56 +1933,56 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Jaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Potki"
 
@@ -1877,10 +2097,10 @@ msgstr "Valitse OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Sulje"
 
@@ -2442,12 +2662,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Muu"
 
@@ -2467,11 +2687,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Poista"
 
@@ -2507,23 +2726,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2531,7 +2750,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -2587,7 +2806,7 @@ msgstr "NPCt"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Hirviöt"
 
@@ -2613,7 +2832,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
@@ -2747,99 +2966,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "musta"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "punainen"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "vihreä"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "sininen"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "kulta"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "keltainen"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "vaaleanpunainen"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "violetti"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "harmaa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "ruskea"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Muokkaa"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -2850,30 +3009,30 @@ msgid "Battle"
 msgstr "Taistelu"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Yleinen ilmoitus:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s ilmoittaa kaikille:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2887,157 +3046,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Kilta"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Ääni"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Ota äänet käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Ota musiikki käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Ota pelin äänitehosteet käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Ota käyttöliittymän äänitehosteet käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Ota muminaäänikeskustelu käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Lataa musiikki"
 
@@ -3060,8 +3215,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Värit"
 
@@ -3230,100 +3385,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Väri näyttää tältä"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tyyppi:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Viive:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Punainen:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Vihreä:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Sininen:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Staattinen"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Sykkivä"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektri"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Aseta"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Poista asetus"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Oletus"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3334,50 +3489,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibroi"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Ota peliohjain käyttöön"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Peliohjain"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Lopeta"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3392,279 +3547,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "oletus"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "matala"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "keskitaso"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "korkea"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Sekal."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Korosta hirviön hyökkäyskantama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Kartta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Korosta pelaajan hyökkäyskantama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Piirrä polku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Ota laiska vieritys käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Vierityksen laiskuus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Vierityksen säde"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Liikkuminen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Korjaa sijainti automaattisesti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Pelaaja"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Poissaoloviesti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Näytä työ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Ota käyttöön mainosprotokolla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3672,279 +3817,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Kauppa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Bottien tuki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 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ä"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Näytä tausta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Ei"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Rautakiihdytys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Ota käyttöön karttareduktio (ohjelmallinen)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Ota käyttöön alfakanavan korjaus (ohjelmallinen, voi olla hidas)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Näytä olioiden läpinäkyvyys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Ota käyttöön uudelleenjärjestyshahmot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Pieni muisti, käytä vähemmän muistia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Poista kehittynyt olentojen välimuisti käytöstä (ohjelmallinen)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Poista olentojen välimuisti käytöstä (ohjelmallinen)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4025,401 +4170,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nimi"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relaatio"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutraali"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Ystävä"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Vaimennettu"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Huomiotta jätetty"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Pyyhitty"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Mustalla listalla"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Vihollinen"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Suhteet"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Kiina (kiina)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Tsekki"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Englanti"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Suomi"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Ranska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Saksa"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonesia"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Puola"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japani"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Hollanti (Belgia/fleemi)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portugali"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portugali (Brasilia)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Venäjä"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Espanja (Kastilli)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Kieli"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Turvallinen kirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Japanilainen kirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Oletus"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4530,323 +4634,314 @@ msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Ei tekstiä"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Teksti"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Puhekuplat, ei nimiä"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Puhekuplat nimillä"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "pois päältä"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "LIN"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Kuka on linjoilla"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BT"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Bottitutka"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "TT"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Hymiöt"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "Tie"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Hahmon tiedot"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "Var"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Varusteet"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "Tav"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Tavarat"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "Tai"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Taidot"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "Eri"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Erikoisuudet"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "Sos"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Suhteet"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "PV"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "Lo"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "Pu"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "T?"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Tiesitkö"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "Ase"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
@@ -4858,7 +4953,7 @@ msgstr "Bottitutka"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -4867,61 +4962,21 @@ msgstr "Nollaa"
 msgid "Result"
 msgstr "Tulos"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "nimi"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "paino"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "määrä"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "tyyppi"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Määrä:"
 
@@ -4931,9 +4986,9 @@ msgstr "Määrä:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4943,18 +4998,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Luo"
 
@@ -4963,7 +5018,7 @@ msgstr "Luo"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5011,7 +5066,7 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
@@ -5020,7 +5075,7 @@ msgstr "Vaihda salasana"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Salasana:"
@@ -5053,7 +5108,7 @@ msgid "The new password entries mismatch."
 msgstr "Uuden salasanan kopiot eivät täsmää."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5061,9 +5116,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -5071,11 +5126,11 @@ msgstr "Nimi:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5084,134 +5139,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Miespuolinen"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Naispuolinen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Rotu: "
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poisto"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Vaihda sisäänkirjautumistietoja"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Pelaa"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Tietoja"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5221,48 +5276,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "sateenkaari 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "sateenkaari 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "sateenkaari 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5283,201 +5323,201 @@ msgid "Net"
 msgstr "Verkko"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Musiikki:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Kartta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minikartta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Osoitin:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Hiukkasten määrä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Toimijoita kartalla:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Pelaajan sijainti:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (ei kiihdytystä)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Tekstuurien määrä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Hiukkasluku: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Kohde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Kohteen tunniste:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Hyökkäysviive:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Minimivahinko:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Maksimivahinko:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Kriittinen osuma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Kohteen taso:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Kohteen ryhmä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Kohteen kilta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Sisään: %d tavua/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
@@ -5508,61 +5548,61 @@ msgstr "Avaa tämä ikkuna automaattisesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Yhdistä"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Portti:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5572,47 +5612,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Kaikki"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -5723,62 +5763,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "jacko elää!"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Sulje kun valmis"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Ohita"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Päivitys:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Käytä omaa päivityspalvelinta"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Palvelin:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5855,17 +5885,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Lähetä"
 
@@ -5874,9 +5904,9 @@ msgstr "Lähetä"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Lisää"
 
@@ -5896,7 +5926,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Asu: %d"
@@ -5912,40 +5942,40 @@ msgid "Away outfit"
 msgstr "Poissaoloasu"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Vahvista:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Sähköpostiosoite:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5953,128 +5983,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Lataa"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Hyväksy"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Osta tavaroita"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Myy tavaroita"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Ilmoita"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
@@ -6103,277 +6133,277 @@ msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Killasta %s eroa pyydetty."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Jäsenen kutsuminen kiltaan"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Eroa killasta?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Ryhmä"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Hyö"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Killan nimi"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -6415,149 +6445,104 @@ msgstr "Hahmopisteitä: %d"
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Ei kohdetta"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Salli kohde"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Tarvitsee kohteen"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Yleismagia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Elämämagia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Sotamagia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Muovausmagia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Luontomagia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Astraalimagia"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Komentomuokkain"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "muu"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symboli:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Komento:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Kuvake:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Magiataso:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Tallenna"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Muuta"
 
@@ -6567,12 +6552,12 @@ msgid "You give:"
 msgstr "Annat:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
@@ -6583,36 +6568,36 @@ msgid "Name: %s"
 msgstr "Nimi: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Päivitetään..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Valmis"
 
@@ -6642,42 +6627,42 @@ msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Valitse pelimaailma"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Vaihda kirjautumistietoja"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6685,7 +6670,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6821,163 +6806,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Voima:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Ketteryys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Tuuri:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Tätä tunnistetta ei voi käyttää."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Tuntematon hahmopalvelinvirhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Väärät arvot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Väärä hiustyyli."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Väärä paikka."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Väärä rotu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Hahmo poistettu."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Peli"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Lopetuspyyntö evätty!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Killan nimi: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Kiltamestari: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Kiltataso: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Jäseniä linjoilla: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Jäsenmaksimi: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Keskim. taso: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Kiltakokemusta: %d kkp"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Seuraavaan tasoon: %d kkp"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Killan linna: %s"
@@ -7029,59 +7014,59 @@ msgid "Experience sharing unknown."
 msgstr "Kokemuksen jaon tila on tuntematon."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Vanha salsana on väärä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Rekisteröimätön tunniste."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Väärä salasana."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Tili vanhentunut."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Liian vanha asiakasohjelma."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7091,22 +7076,22 @@ msgstr ""
 "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Palvelin on täynnä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Käyttäjätunnus on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
@@ -7126,289 +7111,289 @@ msgid "Connection to server terminated. "
 msgstr "Yhteys palvelimeen katkaistu. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Viesti"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 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."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Kauppa epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Elehtiminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Istuminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Keskustelun luonti epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Ryhmään liittyminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Huutaminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Et ole vielä riittävän korkealla tasolla!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Voimapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "Manapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Sinulla ei ole muistioita (memo)."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä tätä juuri nyt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Siis mikä?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Siirtymä (warp) epäonnistui..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Varastaminen ei onnistunut..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Nopeusviritelmä havaittu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Kaksinkertainen sisäänkirjautuminen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Voima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Ketteryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Elinvoima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Älykkyys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Näppäryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Tuuri"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Kauppa: sinä ja %s"
@@ -7779,7 +7764,7 @@ msgstr "Turvallinen OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nimetön"
 
diff --git a/po/fr.po b/po/fr.po
index a16cf1efa..400a2c4a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 14:20+0000\n"
-"Last-Translator: Bernard <nard@bh28.net>\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -29,87 +29,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Humain"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Vous avez été tué par %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un objet qui n'existe pas."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,387 +117,387 @@ msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "xp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnu"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) mouvement fou numéro %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible distante de 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller à la cible jusqu'à 2 de distance"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible distante de 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible distante de 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible distante de 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) Portée de l'attaque des archers"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) aller jusqu'à cible à portée - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) aller à la cible"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) suivre : mode inconnu"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) attaque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans bouclier"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec bouclier"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) ramassage"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) sorts d'attaque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) attaquer tous les joueurs"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) attaquer tous, sauf les amis"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Inactif"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) Absent"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) absent"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -507,42 +507,42 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Affiche '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Fais clignoter le nom"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Bulle flottante '...'"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr "Performance"
 
@@ -554,13 +554,13 @@ msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Aide"
@@ -573,11 +573,11 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Fermer"
 
@@ -597,17 +597,17 @@ msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -622,84 +622,84 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, 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."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Hôte de mise à jour invalide : %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
@@ -902,25 +902,25 @@ msgstr "%d secondes"
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -944,66 +944,287 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "défaut"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "noir"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "rouge"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "vert"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "bleu"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "or"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "jaune"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rose"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "violet"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "gris"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "marron"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "arc en ciel 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "arc en ciel 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "arc en ciel 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Magie générale"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magie de Vie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magie de Guerre"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magie de Transmutation"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magie de la Nature"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Magie Astrale"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutre"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Ami"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Négligé"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignoré"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Effacé"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Sous liste noire"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Ennemi"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "non triés"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "par prix"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "par nom"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "par numéro d'identification"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "par poids"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "par nombre"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "par type"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Pas de cible"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Autoriser une Cible"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Nécessite une cible"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Fermeture automatique"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Sauter"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Groupe : %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilde : %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Rang Pvp : %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
@@ -1011,7 +1232,7 @@ msgstr "Poids : %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Échange"
@@ -1025,49 +1246,49 @@ msgstr "Échange"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Attaquer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Message"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Annihiler"
 
@@ -1085,9 +1306,9 @@ msgstr "Annihiler"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Déplacement"
@@ -1096,7 +1317,7 @@ msgstr "Déplacement"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Parler"
@@ -1107,9 +1328,9 @@ msgstr "Parler"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1120,9 +1341,9 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1130,26 +1351,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
@@ -1157,7 +1378,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -1165,7 +1386,7 @@ msgstr "Ajouter à la liste d'ignorés"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
@@ -1188,69 +1409,69 @@ msgstr "Ajouter le nom dans la boite de dialogue"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Annuler"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Objet de carte"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1260,20 +1481,20 @@ msgstr "Renommer"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
@@ -1282,77 +1503,77 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Quitter"
 
@@ -1362,68 +1583,68 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nom : "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -1432,64 +1653,64 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -1497,57 +1718,56 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(défaut)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -1555,134 +1775,134 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr "Objet protégé"
 
@@ -1690,9 +1910,9 @@ msgstr "Objet protégé"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -1700,22 +1920,22 @@ msgstr "Retirer"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Jeter..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Jeter tout"
 
@@ -1723,56 +1943,56 @@ msgstr "Jeter tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Jeter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Partager"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Virer"
 
@@ -1887,10 +2107,10 @@ msgstr "Sélectionner OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Quitter"
 
@@ -2452,12 +2672,12 @@ msgstr "Page suivante"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Autre"
 
@@ -2477,11 +2697,10 @@ msgstr "Sélectionner2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -2517,23 +2736,23 @@ msgstr "Basique"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Fenêtres"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Emoticônes"
 
@@ -2541,7 +2760,7 @@ msgstr "Emoticônes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Conversation"
 
@@ -2597,7 +2816,7 @@ msgstr "PNJs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstres"
 
@@ -2623,7 +2842,7 @@ msgstr "Membres de la guilde"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Effets de particules"
 
@@ -2757,99 +2976,39 @@ msgstr "Point de route"
 msgid "Tiles border"
 msgstr "Bord des tiles"
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Niveau : %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "noir"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "rouge"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "vert"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "bleu"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "or"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "jaune"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "rose"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "violet"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "gris"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "marron"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Ouvrir l'adresse"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Éditer"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -2860,30 +3019,30 @@ msgid "Battle"
 msgstr "Combat"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Annonce globale :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annonce globale de %s :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s est maintenant En Ligne."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s est maintenant Hors Ligne."
@@ -2897,157 +3056,153 @@ msgstr "MJ"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guilde"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Lang"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(pas de son)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Paramètres de base"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Activer le son"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Activer la musique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Activer les effets sonores du jeu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Activer les effets spéciaux de l'interface"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volume de la musique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Activer l'effacement de la musique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Fréquence audio"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "stéréo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "surround+centre+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Canaux audio"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Effets de Son"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Son des informations"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Son des requêtes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Son des messages de chuchotements"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Son des messages de Groupe / Guilde"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Son des surlignages"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Son des messages globaux"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Son des messages d'erreur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Son des demandes d'échange"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Afficher le son des fenêtres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Cacher le son des fenêtres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Activer le chat avec mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Télécharger la musique"
 
@@ -3070,8 +3225,8 @@ msgstr "Protéger la concentration sur le chat"
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -3240,100 +3395,100 @@ msgstr "Afficher le bouton des émoticônes dans le chat"
 msgid "Show motd server message on start"
 msgstr "Afficher le message du serveur motd au démarrage"
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Type : "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Délai : "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Rouge : "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Vert : "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Bleu : "
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statique"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Impulsion"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spectre"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Opacité : "
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Assigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Désassigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Par défaut"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Réinitialiser toutes les touches"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Entrée"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3344,50 +3499,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "inconnu"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibrer"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Détecter les joysticks"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Activer la manette de jeu"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Utiliser le joystick si la fenêtre est au second plan."
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Manette"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stop"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Tournes le manche et n'appuies pas sur les boutons"
 
@@ -3402,279 +3557,269 @@ msgid "No mods present"
 msgstr "Pas de mods présent"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Toujours montrer"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Cacher automatiquement en basse résolution"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Toujours cacher automatiquement"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Système proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Connexion directe"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "Nom d'hôte SOCKS5"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "défaut"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "bas"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "moyen"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "élevés"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Divers"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Sélectionner les monstres par ordre de distance"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Carte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les objets sur le sol"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Afficher les mini-cartes avancées"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Afficher le chemin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Afficher les touches-raccourcis sur la carte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Activer le défilement paresseux"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Paresse de défilement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Rayon de défilement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Redimensionnement automatique des mini-cartes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr "Jouer les animations de la carte"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "En mouvement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Auto-correction de position"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Attaquer la prochaine cible"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Programme de mouvement de fou A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Mouvements relatifs à la souris (bon pour les interfaces tactiles)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Afficher ta propre barre de vie "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Sélectionner les joueurs par ordre de distance"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Message d'absence"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Afficher les compétences"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Activer le filtre de ramassage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr "Possibilité des familiers activée"
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Activer les notifications de poids"
 
@@ -3682,284 +3827,284 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Boutique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat / de vente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "PNJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Boucler les cibles PNJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Support des bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Activer support pour le Bot aux Enchères"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Activer le support du bot de guilde et désactiver le support par défault"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Clavier"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Délai de répétition"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Intervalle de répétition"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Intervalle de répétition personnalisé"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Boutons de raccourcis"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Type de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Adresse du proxy:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr "Activer double-cliques"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activer la protection pour serveurs defaillant (ne pas désactiver)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations de débogage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Activer historique OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Activer l'historique d'entrées"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr "Répertoire des captures d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Retard du réseau entre les sous-serveurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Montrer le fond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Écrasement de la densité de l'écran"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Non"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr "Meilleure performance (activer pour une meilleure performance)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr "Auto ajuster les performances"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Accélération matérielle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 "Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Autoriser la réduction des cartes (Logiciel)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Activer le délai des sprites composés (Logiciel)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Activer le chargement des images avec délai (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Activer l'échantillonneur de textures (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr "Meilleure qualité (désactiver pour une meilleure performance)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 "Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Afficher les créatures en transparence"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Autoriser la réorganisation des cartes éléments de dessin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Petite mémoire (autoriser pour une utilisation moindre de la mémoire)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Désactiver la mise en cache des créatures avancées (logiciel)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Désactiver la mise en cache des créatures"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Différentes options (activer ou désactiver peut améliorer les performances)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr "Activer la compression des textures (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Activer l'extension de texture rectangulaire (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Utiliser le nouveau format interne de texture  (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Activer les atlas de textures (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 "Mettre en cache toutes les sprites par carte (peut utiliser plus de mémoire)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Mettre tous les sons en cache (peut utiliser plus de mémoire)"
 
@@ -4041,401 +4186,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nom"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relation"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutre"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Ami"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Négligé"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignoré"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Effacé"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Sous liste noire"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Ennemi"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relations"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Quand vous ignorez :"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Très petit (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Très petite (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Petite (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normale (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Large (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Large (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Large (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Grand (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Grand (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Grand (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Très grand (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Très grand (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Très grand (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Chinois (Chine)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Tchèque"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Anglais"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finlandais"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Français"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Allemand"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonésien"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italien"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polonais"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japonais"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Néerlandais (Belgique / Flamand)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portugais"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portugais (Brésilien)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Russe"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Espagnol (Castillan)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Turc"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Police principale"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Langue"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Police grasse"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Police d'aide"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Police sécurisée"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr "Police d'écriture des PNJ"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Police japonaise"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr "Police d'écriture chinoise"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Taille de police"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Taille de police des PNJ"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Nom :"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Copyright :"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Info thème"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Thème changé"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarres le jeu pour que les changements soient appliqués."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Petit"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Moyen"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Grand"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Toucher"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Clavier d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Afficher l'icône du clavier d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Action de l'icône clavier"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Joystick d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Afficher le joystick d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Taille de Joystick"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Boutons d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Afficher les boutons d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Format des boutons"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Taille des boutons"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Bouton d'action %u"
@@ -4553,323 +4657,314 @@ msgstr ""
 "réduite."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Pas de texte"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Texte"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bulles, sans noms"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bulles avec noms"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "aucun"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "meilleure qualité"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "normal"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr "meilleure performance"
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "activé"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visuelle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr "Échelle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Notifications"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Montrer les notifications de ramassage dans la conversation"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Montrer les notifications de ramassage avec des effets de particule"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Effets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Prends l'entrée de la souris et le clavier"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Textures floues (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Bulles de texte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max."
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Détail des particules"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Physique des particules"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Activer le contrôle de gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centrer la fenêtre de jeu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Autoriser l'économiseur d'écran à fonctionner"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "OnL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Qui est en ligne"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "AID"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Quêtes"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "TdR"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Testeur de robot"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "Sta"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Tuer les statistiques"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Émoticône"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Statut"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "Equ"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Équipement"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "Inv"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventaire"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "CRT"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "Cmp"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Compétences"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "Spe"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Cpt. spéciales"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "Soc"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "Rac"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "Sor"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "Jet"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Connaissais-tu le"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "BTQ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "TNU"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "FEN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "Cfg"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
@@ -4881,7 +4976,7 @@ msgstr "Testeur de Robot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -4890,61 +4985,21 @@ msgstr "Réinitialiser"
 msgid "Result"
 msgstr "Résultat"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "non triés"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "par prix"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "par nom"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "par numéro d'identification"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "par poids"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "par nombre"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "par type"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr "Créer des objets"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Montant :"
 
@@ -4954,9 +5009,9 @@ msgstr "Montant :"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4966,18 +5021,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Créer"
 
@@ -4986,7 +5041,7 @@ msgstr "Créer"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5034,7 +5089,7 @@ msgstr "Les deux adresses e-mail ne correspondent pas."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -5043,7 +5098,7 @@ msgstr "Changer le mot de passe"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -5076,7 +5131,7 @@ msgid "The new password entries mismatch."
 msgstr "Les nouveaux mots de passe ne correspondent pas."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Nouveau Personnage"
 
@@ -5084,9 +5139,9 @@ msgstr "Nouveau Personnage"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nom :"
 
@@ -5094,11 +5149,11 @@ msgstr "Nom :"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5107,134 +5162,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Couleur :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Coupe :"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Masculin"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Féminin"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Race :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr "Apparence :"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Etes-vous certain de vouloir supprimer ce personnage ?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Compte %s (dernier ouverture le %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Changer de compte"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Jouer"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Informations"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Se désinscrire"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5249,48 +5304,33 @@ msgstr ""
 "Expérience : %u\n"
 "Argent : %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Entrer le mot de passe pour effacer le personnage"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "arc en ciel 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "arc en ciel 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "arc en ciel 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr "%s du familier"
@@ -5311,201 +5351,201 @@ msgid "Net"
 msgstr "Réseau"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Musique :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Mini Carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Curseur :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Comptage de particules :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Nombre d'acteurs sur la carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Position du joueur :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Dessiner les appels :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr "Textures se lient :"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Logiciel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (OpenGL normal)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (OpenGL sécurisé)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 défaut)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Comptage des trames :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Nombre de particules : %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "ID de la Cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Type de cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Niveau de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Race de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Groupe de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Guilde de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Délai d'attaque :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Coup Mini :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Coup Max :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Coup Critique :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Niveau de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Groupe de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Guilde de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping : %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrée : %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
@@ -5536,61 +5576,61 @@ msgstr "Ouverture automatique de cette fenêtre"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Éditer le Serveur"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Connexion..."
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Adresse :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Description :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "URL de la liste en ligne"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Entres au moins l'adresse et le port du serveur."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr "Police d'écriture normale"
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr "Polices d'écriture"
 
@@ -5600,47 +5640,47 @@ msgid "Did you know..."
 msgstr "Savais-tu que..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Tout"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Choisir le nombre d'objets à jeter."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -5751,62 +5791,52 @@ msgstr "%s %d ?"
 msgid "jacko spawning"
 msgstr "Arrivée de Jack0"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Fermeture automatique"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Sauter"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Compte"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Mise à jour : "
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "S'inscrire"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Serveur de mise à jour personnalisé"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Serveur :"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Hôte de mise à jour : %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Ouvrir l'URL d'inscription"
 
@@ -5883,17 +5913,17 @@ msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre "
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -5902,9 +5932,9 @@ msgstr "Soumettre"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Ajouter"
 
@@ -5924,7 +5954,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Tenue : %d"
@@ -5940,40 +5970,40 @@ msgid "Away outfit"
 msgstr "Équipement en absence"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Changer de serveur"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Changer de personnage"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Vérification :"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-mail :"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5981,128 +6011,128 @@ msgstr " Le mot de passe doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr " Le mot de passe doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "vendre objet"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Veux-tu vraiment vendre %s ?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Charger"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Appliquer"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Boutique Personnelle"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Acheter des objets"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Vendre des objets"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Annoncer"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Enchères"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
@@ -6131,281 +6161,281 @@ msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Demande pour quitter la guilde %s effectuée."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Inviter le membre dans la guilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui voulez-vous inviter dans la guilde %s ?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Quitter la guilde ?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous certain de vouloir quitter la guilde %s ?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Membres : %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Joueurs : %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Groupe"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Vous avez demandé à quitter le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voudrais-tu inviter dans le groupe %s ?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous certain de vouloir quitter le groupe %s ?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr "Joueurs visibles : %d"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portails : %u/%u"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atq"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Ramasser les objets"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignorer les objets"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Amis : %u/%u"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Créer un groupe"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Choisis le nom de la guilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'a invité à rejoindre la guilde %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Tu as été invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'a invité à rejoindre son groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'a invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossible de créer le groupe. vous faîtes déjà partie d'un groupe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nom du groupe"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
@@ -6447,149 +6477,104 @@ msgstr "Points de caractéristiques du personnage : %d"
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Pas de cible"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Autoriser une Cible"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Nécessite une cible"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Magie générale"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magie de Vie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magie de Guerre"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magie de Transmutation"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magie de la Nature"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magie Astrale"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Éditeur de commande"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "Magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "Autre"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symbole : "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Commande :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Commentaire : "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Type de Cible :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icône : "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana : "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "École de magie : "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Sauvegarder"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confirmé. En attente..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Accepter l'échange"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Accepté. En attente..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Échange : Toi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Changer"
 
@@ -6599,12 +6584,12 @@ msgid "You give:"
 msgstr "Vous donnez :"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Bous n'avez pas assez d'argent."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez pas ajouter deux fois le même "
@@ -6617,36 +6602,36 @@ msgid "Name: %s"
 msgstr "Nom : %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr "Afficher toutes les nouvelles (peut être lent)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1 Essayes de nouveau plus tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Terminé"
 
@@ -6676,42 +6661,42 @@ msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Sélection du monde"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Changer de Compte"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Choix du monde"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6719,7 +6704,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "touche u"
 
@@ -6860,165 +6845,165 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr " -O --no-opengl : Désactiver OpenGL pour cette session"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Force :"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agilité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitalité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Chance :"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Tu ne peux pas utiliser cette identification."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Erreur inconnue du serveur de personnage."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Stats incorrectes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Cheveux incorrects."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Case incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Race incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr "Apparence incorrecte."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Jeu"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Requête de départ refusée !"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nom de la guilde : %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Maître de la guilde : %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Niveau de la guilde : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Membres en ligne : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Membres maximums : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Niveau moyen : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Expérience Groupe : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Expérience suivante pour la guilde : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Château de la guilde : %s"
@@ -7070,47 +7055,47 @@ msgid "Experience sharing unknown."
 msgstr "Paramètre de partage d'expérience inconnu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectes-toi s'il-te-plaît."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Ancien mot de passe incorrect."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Id non enregistrée."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Le compte a expiré."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Rejeté par le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7118,12 +7103,12 @@ msgstr ""
 "MJs."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Client trop ancien."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7133,22 +7118,22 @@ msgstr ""
 "Merci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Serveur surpeuplé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Mail incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
@@ -7168,13 +7153,13 @@ msgid "Connection to server terminated. "
 msgstr "Connexion au serveur terminée."
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Message"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7182,279 +7167,279 @@ msgstr ""
 "n'êtes plus en mesure de récupérer votre santé."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Vous portez moins de la moitié du poids maximal de votre inventaire. Vous "
 "pouvez maintenant récupérer ta santé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Échec de la transaction !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Émoticône non réalisée !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Vous n'avez pas pu vous asseoir !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Vous n'avez pas pu créer la conversation !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas encore atteint un niveau suffisant !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "SP insuffisants !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Vous n'avez pas d'aide-mémoire !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez pas faire ça maintenant !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez pas utiliser ce pouvoir avec ce type d'arme !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire ça !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Hé ? Qu'est-ce donc que cela ?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Enchainement échoué..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Le poison n'a pas eu d'effet..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr "Force %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr "Agilité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dextérité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr "Chance %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Speed hack détecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Authentification déjà effectuée."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Force"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agilité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Dextérité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Chance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Défense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Attaque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Défense M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Dégâts par s."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Échange : Toi et %s"
@@ -7825,7 +7810,7 @@ msgstr "OpenGL sécurisé"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
 
diff --git a/po/he.po b/po/he.po
index c0fe120e2..1ad4be16f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "מתעלם מהצעות סחר נכנסות"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "הגדרות"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr "וידאו"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "עזרה"
@@ -563,11 +563,11 @@ msgstr "עזרה"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "סגור"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "שגיאה ביצירת ספריית העדכונים!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "פקודה לא מוכרת."
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "כללי"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "ניטרלי"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "חבר"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "מזלזל"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "מתעלם"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "סחרר"
@@ -1009,49 +1230,49 @@ msgstr "סחרר"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "תקוף"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "דבר"
@@ -1091,9 +1312,9 @@ msgstr "דבר"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "קנה"
 
@@ -1104,9 +1325,9 @@ msgstr "קנה"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "מכר"
 
@@ -1114,26 +1335,26 @@ msgstr "מכר"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "בטל"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "שחקנים"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "אחסן"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "החזר"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "השתמש"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "הורד"
 
@@ -1684,22 +1904,22 @@ msgstr "הורד"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "השתמש"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "השלך"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "פצל"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr "בחר אישור"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "יציאה"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "מחק"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "שיחה"
 
@@ -2581,7 +2800,7 @@ msgstr "דמויות"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "מפלצות"
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "כסף: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "הודעה גלובאלית:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "הודעה גלובאלית מאת %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "גילדה"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "שמע"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "צבעים"
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "כך הצבע נראה"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "סטטי"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "פעימה"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "קשת בענן"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "מינסרה"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "שנה"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "ברירת מחדל"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "נמצאו קונפליקטי מקשים."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "כייל"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "ג'ויסטיק"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "עצור"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "נמוך"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "בינוני"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "גבוה"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "מפה"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "חנות"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "לא"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "שם"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "התנהגות"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "ניטרלי"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "חבר"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "מזלזל"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "מתעלם"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "אפשר מסחר"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "אפשר לחישות"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "כאשר מתעלם:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "גודל הגופן"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "ללא טקסט"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "טקסט"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "בועות, ללא שמות"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "בועות עם שמות"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "כבוי"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "טקסט מעל הראש"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "אופף FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "מקסימלי"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "מצב"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "לבוש"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "ציוד"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "כישורים"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "אפס"
 
@@ -4858,61 +4953,21 @@ msgstr "אפס"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "צור"
 
@@ -4954,7 +5009,7 @@ msgstr "צור"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
@@ -5011,7 +5066,7 @@ msgstr "שנה סיסמה"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "סיסמה:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "שם:"
 
@@ -5062,11 +5117,11 @@ msgstr "שם:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "זכר"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "נקבה"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "אנא חלק %d נקודות"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "יש להכניס לפחות 4 תוים בשם."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "נתוני שחקן - אישור"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "שחק"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "מידע"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "בטל רישום"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "כן"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "אישור"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "פורט:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "הכל"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצים לאחסן."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצים להחזיר."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצים לפצל."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "התחברות"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "הרשם"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "שרת:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "הבא"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "שלח"
 
@@ -5865,9 +5895,9 @@ msgstr "שלח"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "הוסף"
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח או המכתב בעלי שגיאה."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "החלף שרת"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "החלף שחקן"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "אשר:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "דוא\"ל:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "אשר"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "חבורה"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "מציע לחור"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "אושר. ממתין..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "הסכם למסחר"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "מוסכם. ממתין..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "סחור: אתה"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "שנה"
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr "אתה נותן:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "שם: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "מעדכן..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון לא תם."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "הסתיים"
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "עוצמה"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "זריזות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "חיוניות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "תבונה"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "מיומנות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "מזל"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "ללא שם"
 
diff --git a/po/hr.po b/po/hr.po
index 996ddd9c0..5ffe25bc2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ 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"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr "Slika"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Pomoć"
@@ -564,11 +564,11 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Zatvori"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -613,83 +613,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Općenito"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Mreža Greška"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutralno"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Prijatelj"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Zanemareno"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorirano"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -996,7 +1217,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Trgovanje"
@@ -1010,49 +1231,49 @@ msgstr "Trgovanje"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Napad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1081,7 +1302,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Govori"
@@ -1092,9 +1313,9 @@ msgstr "Govori"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kupi"
 
@@ -1105,9 +1326,9 @@ msgstr "Kupi"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Prodaj"
 
@@ -1115,26 +1336,26 @@ msgstr "Prodaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Poništi"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1347,68 +1568,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1417,64 +1638,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Pohrani"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Preuzmi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1482,57 +1703,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Upotrijebi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -1685,22 +1905,22 @@ msgstr "Skini opremu"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Opremi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Ispusti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Razdvoji"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr "Odaberite OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Obriši"
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2582,7 +2801,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Čudovišta"
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Javna obavijest:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Javna obavijest od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Ceh"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Zvuk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Glasnoća zvučnih efekata"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Glasnoća glazbe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Boje"
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statično"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsiranje"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Duga"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektar"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Dodijeli"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Zadano"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibriraj"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Omogući igraću palicu"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Igraća palica"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "nisko"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "srednje"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "visoko"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Karta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Trgovina"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Ne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Ime"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Odnos"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutralno"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Prijatelj"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Zanemareno"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorirano"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Veličina fonta"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Nema teksta"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Mjehurići, bez imena"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Mjehurići s imenima"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "isključeno"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Stanje"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Oprema"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Zalihe"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Vještine"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4850,7 +4945,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Poništi"
 
@@ -4859,61 +4954,21 @@ msgstr "Poništi"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4923,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4935,18 +4990,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Stvori"
 
@@ -4955,7 +5010,7 @@ msgstr "Stvori"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
@@ -5012,7 +5067,7 @@ msgstr "Promijeni Lozinku"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Lozinka"
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Ime:"
 
@@ -5063,11 +5118,11 @@ msgstr "Ime:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5076,134 +5131,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Muško"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Žensko"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Igraj"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Odjavi"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "Da"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "U redu"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Sve"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Odaberite količinu predmeta za spremanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Odaberite iznos predmeta za preuzimanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5717,62 +5757,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Korisničko ime"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registriraj se"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Poslužitelj:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5849,17 +5879,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Slijedeći"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Dostavi"
 
@@ -5868,9 +5898,9 @@ msgstr "Dostavi"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Dodaj"
 
@@ -5890,7 +5920,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5906,40 +5936,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Promijeni lika"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Potvrdi:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-pošta:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5947,128 +5977,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Primjeni"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6097,277 +6127,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Partija"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6409,149 +6439,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Predloži razmjenu"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Potvrđeno. Čekanje..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Složi se za trgovanje"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Dogovoreno. Čekanje..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Izmijeni"
 
@@ -6561,12 +6546,12 @@ msgid "You give:"
 msgstr "Daješ:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6578,36 +6563,36 @@ msgid "Name: %s"
 msgstr "Ime: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Ažuriranje"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -6637,42 +6622,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6680,7 +6665,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6815,163 +6800,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7023,58 +7008,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7082,22 +7067,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7117,290 +7102,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Snaga"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Okretnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Inteligencija"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Spretnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Sreća"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7770,7 +7755,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "neimenovano"
 
diff --git a/po/hu.po b/po/hu.po
index cfd73a834..64ec7115d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Beállítások"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr "Videó"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Súgó"
@@ -563,11 +563,11 @@ msgstr "Súgó"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Bezár"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Hiba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Ismeretlen parancs."
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Általános"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Semleges"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Barát"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Semmibevett"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Tiltott"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Üzlet"
@@ -1009,49 +1230,49 @@ msgstr "Üzlet"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Támadás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Csevegés"
@@ -1091,9 +1312,9 @@ msgstr "Csevegés"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Vétel"
 
@@ -1104,9 +1325,9 @@ msgstr "Vétel"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Eladás"
 
@@ -1114,26 +1335,26 @@ msgstr "Eladás"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Mégse"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Játékosok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Raktároz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Magához vesz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Bevet"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -1684,22 +1904,22 @@ msgstr "Nem használ"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Használ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Eldob"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Felosztás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr "Ok Kiválasztása"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Törlés"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2581,7 +2800,7 @@ msgstr "Gépjátékos neve"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Szörny neve"
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globális bejelentés:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globális bejelentés (%s) :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Klán"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audió"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Effektek hangereje"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Zene hangereje"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Színek"
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statikus"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulzáló"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Szivárvány"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Színkép"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Hozzárendel"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Alapértelmezett"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibrálás"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Joystick engedélyezése"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Leállít"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "alacsony"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "közepes"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "magas"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Térkép"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Üzlet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "Gépjátékos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Név"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Kapcsolat"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Semleges"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Barát"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Semmibevett"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Tiltott"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Üzletelés engedélyezése"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Privát engedélyezése"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Betűméret"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 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."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Nincs szöveg"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Szöveg"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Buborékok, nincs név."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Buborékok nevekkel"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "ki"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max."
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Státusz"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Felszerelés"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Táska"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Képességek"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Alaphelyzet"
 
@@ -4858,61 +4953,21 @@ msgstr "Alaphelyzet"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ár: %s / Teljes: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -4954,7 +5009,7 @@ msgstr "Létrehozás"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Jelszó módosítása"
 
@@ -5011,7 +5066,7 @@ msgstr "Jelszó módosítása"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Jelszó:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Név:"
 
@@ -5062,11 +5117,11 @@ msgstr "Név:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Férfi"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Nő"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "A nevednek minimum 4 karakternek kell lennie."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Karakter törlésének megerősítése"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Játék"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Infó"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "Igen"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Mind"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Válaszd ki mennyit akarsz eldobni."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Válaszd ki a raktározandó mennyiséget."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Válaszd ki mennyit veszel magadhoz."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Válaszd ki az elosztandó mennyiséget."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Belépés"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Regisztráció"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Szerver:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Következő"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Küldés"
 
@@ -5865,9 +5895,9 @@ msgstr "Küldés"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Hozzáad"
 
@@ -5887,7 +5917,7 @@ 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ó."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Szerver változtatása"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Karakter változtatása"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Megerősítés:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Alkalmaz"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Csapat"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Üzletet javasol"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Megerősítve. Vár..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Üzlet elfogadása"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Elfogadva. Vár..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Üzlet: Te"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Változtatás"
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr "Adott tárgyak:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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."
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "Név: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Frissítés…"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Kész"
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Lekapcsolódtál a szerverről!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Erő"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Mozgékonyság"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Egészség"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Ügyesség"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Szerencse"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s üzletelni akar veled. Te akarsz vele?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Névtelen"
 
diff --git a/po/id.po b/po/id.po
index 1526008fb..3a0bb35ee 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -22,474 +22,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?)serangan"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) pergi"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) pergi"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -499,42 +499,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -546,13 +546,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Bantuan"
@@ -565,11 +565,11 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Tutup"
 
@@ -589,17 +589,17 @@ msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
@@ -614,83 +614,83 @@ msgstr "Pergantian server"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Ubah sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
@@ -892,25 +892,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -934,65 +934,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "kembalikan ke semula"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "hitam"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "merah"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "hijau"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "biru"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "emas"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "kuning"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "merah muda"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "ungu"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "abu-abu"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "coklat"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "pelangi 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "pelangi 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "pelangi 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Sihir dasar"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Sihir kehidupan"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Sihir perang"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Sihir transmutasi"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Sihir alam"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Sihir Astral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Netral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Teman"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Diabaikan"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ditolak"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Dihapus"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Tidak ada target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Perbolehkan Target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Membutuhkan Target"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Tutup otomatis"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "lanjutkan"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Kelompok: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Organisasi: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
@@ -1000,7 +1221,7 @@ msgstr "Berat: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Tukar"
@@ -1014,49 +1235,49 @@ msgstr "Tukar"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Pukul"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Berbisik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Sembunyikan"
 
@@ -1074,9 +1295,9 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Jalan"
@@ -1085,7 +1306,7 @@ msgstr "Jalan"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Berbicara"
@@ -1096,9 +1317,9 @@ msgstr "Berbicara"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Beli"
 
@@ -1109,9 +1330,9 @@ msgstr "Beli"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Jual"
 
@@ -1119,26 +1340,26 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
@@ -1146,7 +1367,7 @@ msgstr "Tambahkan ke daftar menyerang"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
@@ -1154,7 +1375,7 @@ msgstr "Tambahkan ke daftar Abaikan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
@@ -1177,69 +1398,69 @@ msgstr "Tambahkan nama ke Obrolan"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Batal"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Daftar barang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Ganti nama"
 
@@ -1249,20 +1470,20 @@ msgstr "Ganti nama"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1271,77 +1492,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Setelan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1351,68 +1572,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nama:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "komentar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
@@ -1421,64 +1642,64 @@ msgstr "Tambahkan semua ke Penukaran"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Masukkan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Masukkan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Masukkan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Kembalikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -1486,57 +1707,56 @@ msgstr "Ambil semua"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Sembunyikan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Tampilkan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(kembalikan)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -1544,134 +1764,134 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Jadikan teman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Mengikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Tirukan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1679,9 +1899,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -1689,22 +1909,22 @@ msgstr "Lepaskan"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Buang semuanya"
 
@@ -1712,56 +1932,56 @@ msgstr "Buang semuanya"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Pecah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "keluarkan"
 
@@ -1876,10 +2096,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Keluar"
 
@@ -2441,12 +2661,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Lainnya"
 
@@ -2466,11 +2686,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Hapus"
 
@@ -2506,23 +2725,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2530,7 +2749,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -2586,7 +2805,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2612,7 +2831,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efek partikel"
 
@@ -2746,99 +2965,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "hitam"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "merah"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "hijau"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "biru"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "emas"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "kuning"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "merah muda"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "ungu"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "abu-abu"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "coklat"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Ganti"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -2849,30 +3008,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2886,157 +3045,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Organisasi"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Suara"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Perbolehkan Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Perbolehkan musik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Perbolehkan game sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Perbolehkan gui sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volume Musik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Perbolehkan gumaman obrolan suara"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Unduh musik"
 
@@ -3059,8 +3214,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Warna"
 
@@ -3229,100 +3384,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Warnanya terlihat seperti ini"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tipe"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Tunda:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Merah:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Hijau:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Biru:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statis"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Getar"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Pelangi"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Tetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Batal menetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Kembalikan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Pertentangan kunci(kunci) terdeteksi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3331,50 +3486,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Berhenti"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3389,279 +3544,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "kembalikan ke semula"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "rendah"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "sedang"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "tinggi"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "macam-macam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Sorot Jangkauan menyerang monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Tampilkan hp bar monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Siklus target monster"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Peta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Sorot portal peta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Sorot item yang jatuh"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Sorot Jangkauan menyerang pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Bergerak"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Perbaiki posisi otomatis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3669,279 +3814,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Toko"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Tidak"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Akselerasi perangkat keras"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4022,401 +4167,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nama"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Hubungan"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Netral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Teman"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Diabaikan"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ditolak"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Dihapus"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Perbolehkan penukaran"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Perbolehkan berbisik"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Tema Gui"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Ukuran huruf"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4526,323 +4630,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "tidak ada teks"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Teks"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "mati"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detil partikel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Emotikon"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Perlengkapan"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Perbekalan"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Keahlian"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Apakah kamu tahu"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
@@ -4854,7 +4949,7 @@ msgstr "Pengecek Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -4863,61 +4958,21 @@ msgstr "Reset"
 msgid "Result"
 msgstr "Hasil"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Harga: %s/ Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4927,9 +4982,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4939,18 +4994,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Buat"
 
@@ -4959,7 +5014,7 @@ msgstr "Buat"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5007,7 +5062,7 @@ msgstr "Pengisian alamat email tidak cocok"
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Ganti sandi"
 
@@ -5016,7 +5071,7 @@ msgstr "Ganti sandi"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Kata Sandi:"
@@ -5049,7 +5104,7 @@ msgid "The new password entries mismatch."
 msgstr "Password baru yang dimasukkan tidak cocok."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5057,9 +5112,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nama:"
 
@@ -5067,11 +5122,11 @@ msgstr "Nama:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5080,134 +5135,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Warna rambut"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Gaya rambut"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Laki-laki"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Perempuan"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Konfirmasi penghapusan karakter"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Ubah Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Main"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Tidak jadi mendaftar"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Ganti email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5217,48 +5272,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "pelangi 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "pelangi 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "pelangi 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5279,201 +5319,201 @@ msgid "Net"
 msgstr "Jaring"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Musik"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Peta"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Peta mini"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Kursor"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Hitung partikel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Hitung pemain di peta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Posisi Pemain"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Perangkat lunak)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Penghitungan tekstur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Hitung partikel: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Target"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Id target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Kecepatan menyerang:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Pukulan minimal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Pukulan maksimal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Pukulan kritis:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Target Level"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Target Kelompok:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Target Organisasi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Masuk: %d bytes/det"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Keluar: %d bytes/det"
@@ -5504,61 +5544,61 @@ msgstr "Buka jendela otomatis"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Menyambung"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Tipe server:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5568,47 +5608,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Semua"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Tidak diketahui"
 
@@ -5717,62 +5757,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "Jacko bertelur"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Tutup otomatis"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "lanjutkan"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Ingat username"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Update:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Menganti Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Mendaftar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Modifikasi sumber update"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5849,17 +5879,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Masukan"
 
@@ -5868,9 +5898,9 @@ msgstr "Masukan"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Tambah"
 
@@ -5890,7 +5920,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Setelan: %d"
@@ -5906,40 +5936,40 @@ msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Ganti Server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5947,128 +5977,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Memuat"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Terapkan"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Toko personal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Beli barang"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Jual barang"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Umumkan"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
@@ -6097,277 +6127,277 @@ msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Permintaan %s keluar dari Organisasi "
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Tinggalkan organisasi?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Kelompok"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok"
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "serang mob"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6409,149 +6439,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Tidak ada target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Perbolehkan Target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Membutuhkan Target"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Sihir dasar"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Sihir kehidupan"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Sihir perang"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Sihir transmutasi"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Sihir alam"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Sihir Astral"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "sihir"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "lainnya"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Simbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Perintah:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Tipe target:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Ikon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Level sihir:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Level sekolah:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Simpan"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Dikonfirmasi. Menunggu..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Terima penukaran"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Terima. Menunggu..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Tukar: Anda"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Kamu mendapatkan %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Ubah"
 
@@ -6561,12 +6546,12 @@ msgid "You give:"
 msgstr "Anda memberikan:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -6577,36 +6562,36 @@ msgid "Name: %s"
 msgstr "Nama: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Mengupdate..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6636,42 +6621,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6679,7 +6664,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6814,163 +6799,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Kekuatan"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7022,58 +7007,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Versi yang digunakan sudah kadaluarsa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7081,22 +7066,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Server kepenuhan."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
@@ -7116,291 +7101,291 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
 "beregenerasi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Anda tidak dapat melakukannya sekarang"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7770,7 +7755,7 @@ msgstr "OpenGL aman"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 25681db96..ba4db394c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -26,87 +26,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Umano"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sei stato ucciso da %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Forza raccolta oggetti non-esistenti"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "L'oggetto è troppo lontano."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "L'inventario è pieno"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Troppi oggetti impilati."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "L'oggetto è riservato ad un altro giocatore."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr "Raccolta oggetto fallita. Errore sconosciuto."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,387 +114,387 @@ msgstr[0] "Hai raccolto %d  [@@%d|%s@@]."
 msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "EXP"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) Modalita' movimento standard"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) Modalita' movimento invertita"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Modalita' movimento casuale"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) Modalita' movimento casuale, estesa"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) Modalita' movimento casuale, personalizzata"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) Movimento casuale"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) spostati fino all'obbiettivo, default"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) spostati fino all'obbiettivo, distanza 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) spostati fino all'obbiettivo, distanza 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) spostati fino all'obbiettivo, distanza 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) spostati fino all'obbiettivo, distanza 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) spostati fino all'obbiettivo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) Modalita' Segui, default"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) Modalita' Segui, relativa"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) Modalita' Segui, specchio"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) Modalita' Segui, pet"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) Modalita' Segui, sconosciuta"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) attacco"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) Attacco default"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) Cambia ad Attacco senza scudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) Cambia ad Attacco con scudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) Muovi e attacca"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) Muovi, attacca e raccogli"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) Disattiva Attacco automatico"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) Raccogli"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usa #flar come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usa #chiza come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usa #ingrav come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usa #frillyar come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usa #upmarmu come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) attacco magico"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) Attacca tutti i giocatori"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) Attacca tutti eccetto amici"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) Attacca cattive relazioni"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) Non attaccare giocatori"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) Attacco PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Assente"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) Modalita' camera gioco"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) Modalita' camera libera"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -504,42 +504,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Stampa '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -551,13 +551,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Aiuto"
@@ -570,11 +570,11 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Chiudi"
 
@@ -594,17 +594,17 @@ msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -619,83 +619,83 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, 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."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
@@ -897,25 +897,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -940,65 +940,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Errore di rete"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "Predefinito"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "Nero"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "Rosso"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "Verde"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "Blu"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "Oro"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "Giallo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "Rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "Viola"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "Grigio"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "Marrone"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "Arcobaleno 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "Arcobaleno 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "Arcobaleno 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Magia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magia della vita"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magia della guerra"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magia della transmutazione"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magia della natura"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Magia astrale"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutrale"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Amico"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Disprezzato"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorato"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Cancellato"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Nella lista nera"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Nemico"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "non classificato"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "per prezzo"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "per nome"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "per ID"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "per peso"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "per quantita'"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "per tipo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Nessun target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Permetti target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Target richiesto"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normale"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Chiusura automatica"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Salta"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Party: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1006,7 +1227,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Commercia"
@@ -1020,49 +1241,49 @@ msgstr "Commercia"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Nascondi"
 
@@ -1080,9 +1301,9 @@ msgstr "Nascondi"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Movimento"
@@ -1091,7 +1312,7 @@ msgstr "Movimento"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Parla"
@@ -1102,9 +1323,9 @@ msgstr "Parla"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Compra"
 
@@ -1115,9 +1336,9 @@ msgstr "Compra"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Vendi"
 
@@ -1125,26 +1346,26 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Rimuovi dalla lista Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Aggiungi alla lista Attacco - Priorità"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Aggiungi alla lista Attacco"
 
@@ -1152,7 +1373,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -1160,7 +1381,7 @@ msgstr "Aggiungi alla lista Ignora"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
@@ -1183,69 +1404,69 @@ msgstr "Aggiungi nome alla chat"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -1255,20 +1476,20 @@ msgstr "Rinomina"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
@@ -1277,77 +1498,77 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Non rimuovere il nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Lascia"
 
@@ -1357,68 +1578,68 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Invita nel party"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Rinomina mappa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nome:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Commento giocatore:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Commento:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -1427,64 +1648,64 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -1492,57 +1713,56 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(default)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -1550,134 +1770,134 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Mostra Finestra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1685,9 +1905,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Togli"
 
@@ -1695,22 +1915,22 @@ msgstr "Togli"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -1718,56 +1938,56 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Caccia"
 
@@ -1882,10 +2102,10 @@ msgstr "Seleziona OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Esci"
 
@@ -2447,12 +2667,12 @@ msgstr "Page down"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Altro"
 
@@ -2472,11 +2692,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Elimina"
 
@@ -2512,23 +2731,23 @@ msgstr "Base"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Finestre"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Faccine"
 
@@ -2536,7 +2755,7 @@ msgstr "Faccine"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2592,7 +2811,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Mostri"
 
@@ -2618,7 +2837,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Effetti particelle"
 
@@ -2752,99 +2971,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "Nero"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "Rosso"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "Verde"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "Blu"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "Oro"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "Giallo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "Rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "Viola"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "Grigio"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "Marrone"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Apri url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2855,30 +3014,30 @@ msgid "Battle"
 msgstr "Battaglia"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Annuncio generale:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annuncio generale da %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s sussurra: %s "
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2892,157 +3051,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gilda"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(nessun suono)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Settaggi Base"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Abilita audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Abilita musica"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Abilita game sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Abilita gui sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volume musica"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Frequenza audio"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "stereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Canali audio"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Effetti sonori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Suono per il sussurro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Suono per i messaggi globali"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Suono per gli errori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Suono per la richiesta di scambio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Mostra finestra dell'audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Nascondi finestra dell'audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Abilita chat vocale mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Scarica musica"
 
@@ -3065,8 +3220,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Colori"
 
@@ -3235,100 +3390,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Ritardo: "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "rosso"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "verde"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "blu"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statico"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsazione"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Gamma"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Imposta"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Annullare l'assegnazione"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Predefinito"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Resetta tutte le scorciatoie"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Input"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3339,50 +3494,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "sconosciuto"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibra"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Rileva i joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Ferma"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3397,279 +3552,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Mostra sempre"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Nascondi sempre"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Sistema Proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Connessione diretta"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "Predefinito"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "Basso"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "medio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "Alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Varie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Mostra danno afflitto ai nemici"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Target automatico solo sui nemici raggiungibili"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Evidenzia distanza massima di attacco del nemico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Mostra la barra HP dei nemici"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Ciclo di target sui nemici"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Mostra le particelle per le transizioni di mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Evidenzia i cambiamenti di mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Evidenzia oggetti sul terreno"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Evidenzia distanza massima d'attacco"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Mostra minimap estesa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Traccia sentiero"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Mostra hotkeys sulla mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Adatta automaticamente le minimappe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Correggi posizione automaticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Attacca in movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Attacca Target successivo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Sincronizza movimenti giocatore"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Movimento matto \"A\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Giocatore"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Mostra la barra HP giocatore"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Abilita statistiche veloci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Ciclo di target sui giocatori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Visualizza messaggi popup"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Mostra barra lavoro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Attiva filtro attacchi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Attiva filtro 'Raccogli'"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3677,279 +3822,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Negozio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Accetta richieste di vendita/acquisto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Abilita la modalità negozio"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Log dialoghi NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Tastiera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Server Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Tipologia Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Proxy indirizzo:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Attiva attacchi server-side"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Attiva registro attivita' OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Nascondi lo scudo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usa FBO, Frame Buffer Object (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Mostra sfondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "No"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Accellerazione hw"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Attiva ritardo sprite composite (modalita': Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Attiva ritardo caricamento immagini (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Attiva campionamento texture (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Abilita fix del canale alpha (Software, può rallentare il gioco)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Mostra trasparenza personaggi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Abilita Riordina Sprites."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Modalità Poca Memoria (abilita per usare meno memoria)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Abilita estenzione texture rettangolari (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Usa nuovo formato texture interno (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Attiva raggruppamento texture (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4030,401 +4175,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nome"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relazione"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutrale"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Amico"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Disprezzato"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorato"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Cancellato"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Nella lista nera"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Nemico"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relazioni"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Minuscolo (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Piccolo (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Cinese (Cina)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Ceco"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Inglese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finlandese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Francese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Tedesco"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonesiano"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polacco"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Giapponese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Olandese (Belgio/Fiandre)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portoghese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portoghese (Brasile)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Russo"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Spagnolo (Castigliano)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Tema Gui"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Font principale"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Font in grassetto"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Font con particelle"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Help font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Caratteri giapponesi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Informazioni sul tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Piccoli"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normale"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Medi"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Grandi"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Tastiera su schermo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Mostra l'icona della tastiera su schermo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Joystick su schermo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Mostra joystick sullo schermo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Grandezza del joystick"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Bottoni sullo schermo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Mostra bottoni sullo schermo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Formato bottoni"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Grandezza bottoni"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4540,323 +4644,314 @@ msgstr ""
 "ridotta"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Nessun testo"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Testo"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Nuvolette senza nomi"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Nuvolette con nomi"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "Spento"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "qualita' migliore"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "normale"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visuale"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Notifiche"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Notifica oggetti raccolti nella chat."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Notifica oggetti raccolti in-game."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Effetti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Abilita texture sfocate (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Testo sovrastante"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "massimo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Dettaglio particelle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Fisica Particle"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Abilita controllo gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centra la finestra di gioco"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Permetti allo screensaver di attivarsi"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Chi è online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Missioni"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Bot checker"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Faccine"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Stato"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Abilità"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Speciali"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Sociale"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Suggerimenti"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
@@ -4868,7 +4963,7 @@ msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -4877,61 +4972,21 @@ msgstr "Reimposta"
 msgid "Result"
 msgstr "Risultato"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "non classificato"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "per prezzo"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "per nome"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "per ID"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "per peso"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "per quantita'"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "per tipo"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Quantita':"
 
@@ -4941,9 +4996,9 @@ msgstr "Quantita':"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4953,18 +5008,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Crea"
 
@@ -4973,7 +5028,7 @@ msgstr "Crea"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5021,7 +5076,7 @@ msgstr "Gli indirizzi email immessi non coincidono."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Cambia la Password"
 
@@ -5030,7 +5085,7 @@ msgstr "Cambia la Password"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Password:"
@@ -5063,7 +5118,7 @@ msgid "The new password entries mismatch."
 msgstr "Le password immesse non coincidono."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Nuovo Personaggio"
 
@@ -5071,9 +5126,9 @@ msgstr "Nuovo Personaggio"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nome:"
 
@@ -5081,11 +5136,11 @@ msgstr "Nome:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5094,134 +5149,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Maschio"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Femmina"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Razza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Conferma la cancellazione del personaggio"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Cambia login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Gioca"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Informazioni"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Cambia email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5231,48 +5286,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Password non valida"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Digitare password per eliminare un personaggio"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Digitare password:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "Arcobaleno 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "Arcobaleno 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "Arcobaleno 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5293,201 +5333,201 @@ msgid "Net"
 msgstr "Rete"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Musica:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Mini mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Cursore:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Contatore Particelle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Contatore generatori mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Posizione giocatore:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (OpenGL mobile)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Conteggio Textures:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Conto particelle: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Target ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Livello target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Razza target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Party target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Gilda target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Ritardo Attacco:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Danno minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Danno massimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Colpo critico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Livello Target"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Party del Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Gilda del Target"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
@@ -5518,61 +5558,61 @@ msgstr "Apri automaticamente questa finestra"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Modifica Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Connetti"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Indirizzo:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Porta:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Tipo di server:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Descrizione:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5582,47 +5622,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Tutti"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Sconosciuto"
 
@@ -5733,62 +5773,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "Comparsa jacko"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Chiusura automatica"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Salta"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Autenticazione"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Ricorda username"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Aggiornamento:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Cambia server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registra"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Aggiornamento host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Apri URL di registrazione"
 
@@ -5865,17 +5895,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Invia"
 
@@ -5884,9 +5914,9 @@ msgstr "Invia"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -5906,7 +5936,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Outfit: %d"
@@ -5922,40 +5952,40 @@ msgid "Away outfit"
 msgstr "Away outfit"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Cambia server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Cambia personaggio"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Conferma:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5963,128 +5993,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Carica"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Preparazione download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Applica"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Compra oggetti"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Vendi oggetti"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Annuncia"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Mostra link nell'annuncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
@@ -6113,277 +6143,277 @@ msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invitato utente %s alla gilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Abbandono gilda %s richiesto."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "invita qualcuno nel gruppo"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Chi vorresti invitare alla gilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Lasciare la gilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Party"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s"
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Abbandono gruppo %s richiesto"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Invita qualcuno nel gruppo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Chi vorresti invitare al gruppo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Lasciare il gruppo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler lasciare il gruppo %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Attacco"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Priorità mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Attacca mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignora mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Raccogli oggetti"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignora oggetti"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Crea gruppo"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
@@ -6425,149 +6455,104 @@ msgstr "Punti personaggio: %d"
 msgid "Correction points: %d"
 msgstr "Punti correzione: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Nessun target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Permetti target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Target richiesto"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Magia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magia della vita"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magia della guerra"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magia della transmutazione"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magia della natura"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magia astrale"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Editor dei comandi"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "altro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Simbolo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Commento:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Tipo di target:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Livello magico:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Scuola di magia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Livello scuola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Salva"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confermato. In attesa..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Accetta scambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Accettato. In attesa..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Ottieni %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Cambia"
 
@@ -6577,12 +6562,12 @@ msgid "You give:"
 msgstr "Dai:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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 "
@@ -6595,36 +6580,36 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Aggiornamento..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  riprova più tardi"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Completato"
 
@@ -6654,42 +6639,42 @@ msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Seleziona parola"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Cambia login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Scegli parola"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6697,7 +6682,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6835,163 +6820,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Forza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agilità:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Costituzione:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Fortuna:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accesso negato. Probabilmente il server è sovraccarico."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "ID non disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Errore char-server sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Creazione personaggio non riuscita. Il nome è già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Nome errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Statistiche errate."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Taglio capelli errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Slot errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Razza errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Personaggio eliminato."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Il messaggio privato non puo' essere inviato, %s e' offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Il messaggio privato e' stato ignorato da %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Gioco"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Richiesta di chiusura rifiutata!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Gilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Master di Gilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Livello Gilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Membri Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Numero massimo Membri: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Livello Medio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Punti Exp Gilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7043,47 +7028,47 @@ msgid "Experience sharing unknown."
 msgstr "Esperienza in comune sconosciuta"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "L'account non è stato trovato. Per favore effettua un nuovo login."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "La vecchia password è sbagliata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "La nuova password è troppo corta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "ID non registrato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Password errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Account scaduto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Rifiutato dal server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7091,12 +7076,12 @@ msgstr ""
 "per maggiori informazioni."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Versione del Client obsoleta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7106,22 +7091,22 @@ msgstr ""
 "Contatta il team GM sul forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Server affollato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Username già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Email errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Username cancellato permanentemente."
 
@@ -7141,13 +7126,13 @@ msgid "Connection to server terminated. "
 msgstr "Connessione al server terminata. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Messaggio"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7155,278 +7140,278 @@ msgstr ""
 "vita."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Scambio non riuscito!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Emote fallito!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Non puoi sederti!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Creazione Chat fallita!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Non puoi aggiungerti al Party!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Non puoi urlare!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai raggiunto un Livello sufficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "HP insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "SP Insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Non hai nessun promemoria!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Al momento non puoi farlo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Non puoi usare questa Abilità con questa arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Hai bisogno un'altra Gemma Rossa!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Hai bisogno un'altra Gemma Blu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Stai trasportando troppo carico per compiere quest'azione!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Huh? Cos'è?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Teletrasporto fallito..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Non riesci a rubare niente..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Il veleno non ha effetto..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Nessun server disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun altro sta provando ad usare questo account."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Questo account è già registrato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Rilevato speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Accesso duplicato"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Forza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agilità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligenza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Destrezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Fortuna"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Difesa."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Attacco magico."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Difesa Magica."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuratezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasione"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Colpo critico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Ritardo Attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Ritardo Movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Range d'attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Danno per secondo"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vuole commerciare con te, accetti?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Scambio con %s"
@@ -7796,7 +7781,7 @@ msgstr "OpenGL safe mode"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "senza nome"
 
diff --git a/po/ja.po b/po/ja.po
index a92ee4287..58bbfe75a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -25,474 +25,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "トレードリクエストを無効にしています"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "人間"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "量が多すぎます"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%d [@@%d|%s@@]を手に入れました"
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "xp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) 攻撃範囲 - 1のターゲットまで移動"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) 空マップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) 友達以外を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "アウェイ"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイア"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -502,42 +502,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "完全無視"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "'...'を表示する"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "名前を点灯させる"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "フローティング'...'吹出し"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "吹出し"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -549,13 +549,13 @@ msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "ヘルプ"
@@ -568,11 +568,11 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "閉じる"
 
@@ -592,17 +592,17 @@ msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -617,83 +617,83 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "不明なコマンドです"
 
@@ -895,25 +895,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
@@ -937,65 +937,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "デフォルト"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "黒"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "赤"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "緑"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "青"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "金色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "黄色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "ピンク"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "紫"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "グレー"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "茶色"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "カラフル1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "カラフル 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "カラフル 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "ジェネラル魔法"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "ライフ魔法"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "ウォー魔法"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "トランスミュート魔法"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "ネイチャー魔法"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "アストラル魔法"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "普通"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "友達"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "無視している"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "完全無視している"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "削除済"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "ブラックリスト化されています"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "敵"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "名前"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "ID"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "重量"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "数量"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "タイプ"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "ターゲットなし"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "ターゲットを有効にする"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "ターゲット必要"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "普通"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "自動で閉じる"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "スキップ"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
@@ -1003,7 +1224,7 @@ msgstr "重力: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "トレード"
@@ -1017,49 +1238,49 @@ msgstr "トレード"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "攻撃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "消す"
 
@@ -1077,9 +1298,9 @@ msgstr "消す"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "動く"
@@ -1088,7 +1309,7 @@ msgstr "動く"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "話す"
@@ -1099,9 +1320,9 @@ msgstr "話す"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "買う"
 
@@ -1112,9 +1333,9 @@ msgstr "買う"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "売る"
 
@@ -1122,26 +1343,26 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "コメントをする"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
@@ -1149,7 +1370,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -1157,7 +1378,7 @@ msgstr "攻撃無視リストへ追加する"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
@@ -1180,69 +1401,69 @@ msgstr "名前をチャットへ追加する"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "マップアイテム"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1252,20 +1473,20 @@ msgstr "名前を変更する"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -1274,77 +1495,77 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "退会"
 
@@ -1354,68 +1575,68 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "          マップサインの名前を変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "プレイヤーコメント            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "コメント:                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -1424,64 +1645,64 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -1489,57 +1710,56 @@ msgstr "全部取出す"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr " 非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(デフォルト)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -1547,134 +1767,134 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "真似"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1682,9 +1902,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "取外す"
 
@@ -1692,22 +1912,22 @@ msgstr "取外す"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -1715,56 +1935,56 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分割"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "追い出す"
 
@@ -1879,10 +2099,10 @@ msgstr "OKを選択する"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "終了"
 
@@ -2444,12 +2664,12 @@ msgstr "ページ下へ"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "その他"
 
@@ -2469,11 +2689,10 @@ msgstr "選択2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "削除"
 
@@ -2509,23 +2728,23 @@ msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "ショートカット"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "ウィンドウ"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "スマイリー"
 
@@ -2533,7 +2752,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "チャット"
 
@@ -2589,7 +2808,7 @@ msgstr "NPC"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "モンスター"
 
@@ -2615,7 +2834,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "パーティクル効果"
 
@@ -2749,99 +2968,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "黒"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "赤"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "緑"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "青"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "金色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "黄色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "ピンク"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "紫"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "グレー"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "茶色"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "装着"
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "URLを開く"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "編集"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2852,30 +3011,30 @@ msgid "Battle"
 msgstr "バトル"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "グローバルアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%sからのアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2889,157 +3048,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "ギルド"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(ミュート)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "オーディオ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "基本設定"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "オーディオを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "音楽を有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "ゲームSFXを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "GUI SFXを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Sfx音量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "音楽の音量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "周波数を自動設定"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "モノ"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "ステレオ"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "サラウンド"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "自動チャンネル"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "音響効果"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "インフォメーションダイアログ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "リクエストダイアログ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "ささやきメッセージ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "ギルド/パーティメッセージ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "メッセージ音をハイライト"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "グローバルメッセージ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "エラーメッセージ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "トレードリクエスト音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "窓の音を有効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "窓の音を無効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Mumble Voice Chatを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "音楽をダウンロードする"
 
@@ -3062,8 +3217,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "色"
 
@@ -3232,100 +3387,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "色の例"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "タイプ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "遅延:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "赤:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "緑:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "青:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "穏やか"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "点滅"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "カラフル"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "スペクトル"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "アルファ:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "割り当てる"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "割り当て解除"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "標準に戻す"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "全てのキーをリセット"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "入力"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "ショートカットキーが重複しています"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3336,50 +3491,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "不明"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "ボタンを押してカリブレーションを開始"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "カリブレーション"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "ジョイスティックを使用可能にする"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "クライアントが無効の場合ジョイスティックを使用"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "ジョイスティック"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "ボタンは押さないでスティックを回転する"
 
@@ -3394,279 +3549,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "常に表示"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "細かい解像度で隠す"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "常に自動で隠す"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "システムプロキシ"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "直接接続"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 ホスト名"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "デフォルト"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "低"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "中"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "高"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "その他"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えたダメージを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "攻撃可能範囲のモンスターのみ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "モンスターの攻撃範囲を強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "モンスターのHPバーを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "選択したモンスターを円で表示"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "マップ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "ワープパーティクルを表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "マップポータルを強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "床に落ちているアイテムを強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "攻撃可能範囲を強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "拡張ミニマップを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "パスを表示させる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "マップにホットキーを表示させる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "レイジースクロールを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "レイジースクロール"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "ラディアススクロール"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "動作"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "自動で位置を修正"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "移動中も攻撃する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "プレイヤーの動きを同化する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "クレイジームーブ A プログラム"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "プレイヤー"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "クイックスタッツを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "選択したプレイヤーを円で表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "ジョブExpメッセージを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "プレイヤーポップアップを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "AFKメッセージ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "ジョブを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "攻撃フィルターを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "アドバートプロトコルを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3674,279 +3819,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "売買リクエストを受け入れる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "ショップモードを有効にする"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "NPCターゲットを回転"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "NPCダイアログを記録する"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "ボットサポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "ショートカットボタン"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "プロキシサーバー"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "プロキシタイプ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "プロキシアドレス:ポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "OpenGLログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "入力ログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "シールドスプライトを隠す"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "背景を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "いいえ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "ハードウェアアクセラレーション"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "マップ削減を有効化 (ソフトウェア)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "テクスチャサンプラーを有効にする (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "アルファチャンネル修正を有効化 (ソフトウェア-重くなる可能性があります)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "透過を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "スプライトリオーダーを有効にする."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "メモリ優先 (メモリ使用を少なくするには有効にして下さい)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "アドバンスキャッシュを無効にする (ソフトウェア)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "キャッシュを無効にする (ソフトウェア)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4027,401 +4172,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "名前"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "関係"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "普通"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "友達"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "無視している"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "完全無視している"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "削除済"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "ブラックリスト化されています"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "敵"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "トレードを受付ける"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "全てのささやきを受け取る"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "関係"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "完全無視の際には:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "小さい (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "小 (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "中 (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "中国語 (中国)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "チェコ語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "英語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "フィンランド語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "フランス語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "ドイツ語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "インドネシア語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "イタリア語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "ポーランド語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "日本語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "ドイツ語 (ベルギー/フランドル)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "ポルトガル語 (ブラジル)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "ロシア語"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "スペイン語 (カスティリヤ)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "メインフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "言語"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "太字フォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "パーティクルフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "ヘルプフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "安全なフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "日本語フォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "フォントサイズ"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "テーマ情報"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "テーマを変更しました"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "小"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "普通"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "中"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "大"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "タッチ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "オンスクリーンキーボード"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "オンスクリーンジョイスティック"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "オンスクリーンジョイスティックを表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "ジョイスティックのサイズ"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "オンスクリーンボタン"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "オンスクリーンボタンを表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "ボタンフォーマット"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "ボタンのサイズ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "ボタン %u アクション"
@@ -4531,323 +4635,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "テキストなし"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "テキスト"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "吹き出し,名前表示なし"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "吹き出し,名前表示あり"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "オフ"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "ベストクオリティ"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "ノーマル"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "オン"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "視覚"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "通知"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "入手通知をチャットに表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "入手通知をパーティクルで表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "効果"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "マウスとキーボード入力をグラブ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "テクスチャーをぼかす (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "環境FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "パーティクルの詳細"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "パーティクルフィジックス"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "ガンマ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "ガンマコントロールを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vシンク"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "スクリーンセーバーを有効にする"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "オンラインリスト"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "ヘルプ"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "クエスト"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "ボットチェッカー"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "キル統計"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "スマイリー"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "ステータス"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "装着品"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "インベントリー"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "地図"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "スキル"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "スペシャル"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "ソーシャル"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "豆知識"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
@@ -4859,7 +4954,7 @@ msgstr "ボットチェッカー"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "リセット"
 
@@ -4868,61 +4963,21 @@ msgstr "リセット"
 msgid "Result"
 msgstr "結果"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "名前"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "ID"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "重量"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "数量"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "タイプ"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "量:"
 
@@ -4932,9 +4987,9 @@ msgstr "量:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4944,18 +4999,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "作成"
 
@@ -4964,7 +5019,7 @@ msgstr "作成"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5012,7 +5067,7 @@ msgstr "メールアドレスが一致しません"
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "パスワードの変更"
 
@@ -5021,7 +5076,7 @@ msgstr "パスワードの変更"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "パスワード:"
@@ -5054,7 +5109,7 @@ msgid "The new password entries mismatch."
 msgstr "新しいパスワードが一致しません"
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "新しいキャラクター"
 
@@ -5062,9 +5117,9 @@ msgstr "新しいキャラクター"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "名前:"
 
@@ -5072,11 +5127,11 @@ msgstr "名前:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5085,134 +5140,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "髪色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "ヘアスタイル"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "男性"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "女性"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "人種:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "キャラクター削除の確認をしてください"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラクターを削除しますか？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "別アカウントでログイン"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "プレイ"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "情報"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "登録解除"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5222,48 +5277,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "カラフル1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "カラフル 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "カラフル 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5284,201 +5324,201 @@ msgid "Net"
 msgstr "ネット"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "音楽:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "マップ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "ミニマップ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "カーソル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "パーティクル数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "マップアクターの数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "プレイヤーの位置:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (ソフトウェア)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (モバイルOpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "テクスチャー数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "パーティクル数:%d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "ターゲット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "ターゲットID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "ターゲットレベル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "ターゲット種別:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "ターゲットパーティ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "最低ヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "最高ヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "クリティカルヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "ターゲットレベル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "ターゲットパーティ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "ピング: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "入力: %dバイト/秒"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "出力: %d バイト/秒"
@@ -5509,61 +5549,61 @@ msgstr "この窓を自動で開ける"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "サーバー編集"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "接続"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "アドレス:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "ポート:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "サーバータイプ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "詳細:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい"
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5573,47 +5613,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "購入リストに追加"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "販売リストに追加"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "不明"
 
@@ -5722,62 +5762,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "JackOが出現中"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "自動で閉じる"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "スキップ"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "ユーザー名を記憶する"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "アップデート:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "サーバー変更"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "登録"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "サーバー:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "アップデートホスト: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5854,17 +5884,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "決定"
 
@@ -5873,9 +5903,9 @@ msgstr "決定"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "追加"
 
@@ -5895,7 +5925,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "服装: %d"
@@ -5911,40 +5941,40 @@ msgid "Away outfit"
 msgstr "AFK中の服装"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "サーバーを変更する"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "キャラクターを変更する"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Eメール:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5952,128 +5982,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "適用"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "購入"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "販売"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "アナウンス"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
@@ -6102,277 +6132,277 @@ msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "ユーザー %sを、ギルド %sに招待しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド %sへ退会届を出しました"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "ギルドへメンバーを招待しました"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "ギルド %sに誰を招待しますか？"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "ギルドから退会しますか？"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %sから本当に退会しますか?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "パーティー"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました"
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "パーティ %sへ退会届を出しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "メンバーをパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "パーティ %sに誰を招待しますか?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "パーティーから退会しますか？"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "ナビ"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "攻撃"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "優先される敵"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "無視している敵"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "パーティを作る"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "ギルド名"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "パーティ名"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
@@ -6414,149 +6444,104 @@ msgstr "キャラクターポイント: %d"
 msgid "Correction points: %d"
 msgstr "修正点: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "ターゲットなし"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "ターゲットを有効にする"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "ターゲット必要"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "ジェネラル魔法"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "ライフ魔法"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "ウォー魔法"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "トランスミュート魔法"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "ネイチャー魔法"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "アストラル魔法"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "コマンドエディタ"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "魔法"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "他"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "シンボル:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "コマンド:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "コメント:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "ターゲットタイプ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "アイコン:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "マナ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "魔法レベル:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "魔法学園:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "学校レベル:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "セーブ"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "トレードを申請する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "確認中"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "トレードを了承する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "了承しました"
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "トレード:自分"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "変更"
 
@@ -6566,12 +6551,12 @@ msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "GP不足です"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
@@ -6584,36 +6569,36 @@ msgid "Name: %s"
 msgstr "名前: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "更新しています..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "完了"
 
@@ -6643,42 +6628,42 @@ msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "世界を選ぶ"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "ログインの変更"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "世界の選択"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6686,7 +6671,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u キー"
 
@@ -6824,165 +6809,165 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "攻撃力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "機敏さ:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "防御力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "魔力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "命中率:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "幸運:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "アクセスできません。サーバーが混みあっています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "このIDは使用できません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "不明なキャラクターサーバーエラー"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
 "れています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "名前が違います"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "間違った統計"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "間違った髪型"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "間違ったスロット"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "種別が間違っています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "キャラクターを削除しました"
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "%sがオフラインの為ささやきは送れませんでした"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "%sが完全無視設定をしている為ささやきは送れませんでした"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "ゲーム"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "今キャンセルできません"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "ギルド名: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "ギルドマスター: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "ギルドレベル: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "オンラインユーザー: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "最大メンバー数: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "平均レベル: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "ギルドExp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "次のギルドExpまで: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "ギルド城: %s"
@@ -7034,58 +7019,58 @@ msgid "Experience sharing unknown."
 msgstr "Expシェアモード不明"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "アカウントが見つかりませんでした。再度ログインして下さい"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "変更前のパスワードが間違っています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "不明なエラー"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "未登録なID"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "入力したパスワードは間違っています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "アカウントの有効期限が切れました"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "サーバーから拒否されました"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7095,22 +7080,22 @@ msgstr ""
 "GMにご連絡下さい。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "サーバーが混雑しています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "ユーザ名は既に使用されています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "メールアドレスが違います"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "ユーザーネームは永久に削除されました"
 
@@ -7130,289 +7115,289 @@ msgid "Connection to server terminated. "
 msgstr "サーバーへの接続が切断されました "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "メッセージ"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "トレード失敗"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "スマイリー表示失敗"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "座れません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "チャット作成失敗"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "パーティに参加できませんでした"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "叫べません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたはまだ十分なlvlに達していません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "HP不足"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "SP不足"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "メモがありません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "今この行動はできません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "GPが足りません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "このスキルはこの武器と一緒に使えません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Red Gemが必要です"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Blue Gemが必要です"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "アイテムを持ちすぎています"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "うん？何それ？"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "ワープに失敗しました"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "何も盗めませんでした"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "毒の影響はなかった"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "認証に失敗しました"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "利用できるサーバーがありません"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "重複ログイン"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "攻撃力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "機敏さ"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "防御力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "魔力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "命中率"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "攻撃距離"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "ダメージ/秒"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%sはあなたにトレードを申請しています"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "あなたと%sとのトレード"
@@ -7782,7 +7767,7 @@ msgstr "セーフ OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
diff --git a/po/ka.po b/po/ka.po
index 3a378e9dc..9f4f64d71 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -19,474 +19,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -496,42 +496,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -543,13 +543,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -562,11 +562,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -586,17 +586,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,83 +611,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "უცნობი კომანდა."
 
@@ -887,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -928,65 +928,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -994,7 +1215,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1008,49 +1229,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1068,9 +1289,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1079,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1090,9 +1311,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1103,9 +1324,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1113,26 +1334,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1140,7 +1361,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1148,7 +1369,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1171,69 +1392,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1243,20 +1464,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1265,77 +1486,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1345,68 +1566,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1415,64 +1636,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1480,57 +1701,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1538,134 +1758,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1673,9 +1893,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1683,22 +1903,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1706,56 +1926,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1870,10 +2090,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr ""
 
@@ -2435,12 +2655,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2460,11 +2680,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr ""
 
@@ -2500,23 +2719,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2524,7 +2743,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2580,7 +2799,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2606,7 +2825,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2740,99 +2959,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2843,30 +3002,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2880,157 +3039,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3053,8 +3208,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3223,100 +3378,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3325,50 +3480,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3383,279 +3538,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3663,279 +3808,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4016,401 +4161,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4520,323 +4624,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4848,7 +4943,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4857,61 +4952,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4921,9 +4976,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4933,18 +4988,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr ""
 
@@ -4953,7 +5008,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5001,7 +5056,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5010,7 +5065,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5043,7 +5098,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5051,9 +5106,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr ""
 
@@ -5061,11 +5116,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5074,134 +5129,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5211,48 +5266,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,12 +5303,12 @@ msgid "Yes"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5498,61 +5538,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5562,47 +5602,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5711,62 +5751,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5843,17 +5873,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5862,9 +5892,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5884,7 +5914,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5900,40 +5930,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5941,128 +5971,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6091,277 +6121,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6403,149 +6433,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6555,12 +6540,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6572,36 +6557,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6631,42 +6616,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6674,7 +6659,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6809,163 +6794,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7017,58 +7002,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7076,22 +7061,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7111,290 +7096,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7764,7 +7749,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 0cc81a1f7..2a0b80c06 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: 2014-02-15 12:09+0300\n"
+"POT-Creation-Date: 2014-02-28 21:21+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"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -563,11 +563,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr ""
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1091,9 +1312,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1104,9 +1325,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1114,26 +1335,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr ""
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr ""
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2581,7 +2800,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4858,61 +4953,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr ""
 
@@ -4954,7 +5009,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5011,7 +5066,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr ""
 
@@ -5062,11 +5117,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5274,201 +5314,201 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5865,9 +5895,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -6574,36 +6559,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6633,42 +6618,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6676,7 +6661,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6811,163 +6796,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7019,58 +7004,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7078,22 +7063,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7113,289 +7098,289 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7765,7 +7750,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index c2b773579..a6c0d82c5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Hjelp"
@@ -563,11 +563,11 @@ msgstr "Hjelp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Lukk"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Feil"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Ukjent kommando"
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Generelt"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Nøytral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Venn"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorert"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1091,9 +1312,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kjøp"
 
@@ -1104,9 +1325,9 @@ msgstr "Kjøp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Selg"
 
@@ -1114,26 +1335,26 @@ msgstr "Selg"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Spillere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Bruk"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Del opp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Slett"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2581,7 +2800,7 @@ msgstr "NPCer"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstre"
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Penger: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Lydeffekt-volum"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Musikk-volum"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Farger"
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Slik ser fargen ut"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statisk"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regnbue"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Tildel"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Standard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Trykk knappen for å starte kalibrasjon"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stopp"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "lav"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "medium"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "høy"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Kart"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Butikk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nei"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Navn"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Nøytral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Venn"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorert"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Tillat handel"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Ingen tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bobler, ingen navn"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bobler med navn"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "av"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "GUI-gjennomsiktighet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "maks"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Utstyr"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Ferdigheter"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Tilbakestill"
 
@@ -4858,61 +4953,21 @@ msgstr "Tilbakestill"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Lag"
 
@@ -4954,7 +5009,7 @@ msgstr "Lag"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Endre passord"
 
@@ -5011,7 +5066,7 @@ msgstr "Endre passord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Passord:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Navn:"
 
@@ -5062,11 +5117,11 @@ msgstr "Navn:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Mann"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Kvinne"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vennligst distribuer %d poeng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Navnet ditt må minst være 4 bokstaver."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vennligst fjern %d poeng"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bekreft karakter-sletting"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakteren?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Avregistrer"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alt"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrer"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Neste"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Bekreft"
 
@@ -5865,9 +5895,9 @@ msgstr "Bekreft"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Bekreft:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Bruk"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Gruppe"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index c55a9b4ad..0c8e4d39c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,87 +20,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "ontwijk"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "mis"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Help"
@@ -564,11 +564,11 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Sluiten"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr "Spelwereld binnengaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Personages aanvragen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Van spelserver wissellen"
 
@@ -613,83 +613,83 @@ msgstr "Van spelserver wissellen"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Registratiedetails aanvragen"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Verander Wachtwoord"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Wachtwoord veranderen geslaagd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Verander E-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "E-mail veranderen geslaagd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Uitschrijven geslaagd!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Vaarwel, je mag altijd terugkomen..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet worden aangemaakt! Sluiten."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet worden aangemaakt! Sluiten."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Netwerkfout"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutraal"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Vriend"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Genegeerd"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -996,7 +1217,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Handel"
@@ -1010,49 +1231,49 @@ msgstr "Handel"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1081,7 +1302,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Spreken"
@@ -1092,9 +1313,9 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1105,9 +1326,9 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1115,26 +1336,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1347,68 +1568,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1417,64 +1638,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1482,57 +1703,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -1685,22 +1905,22 @@ msgstr "Afdoen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr "OK selecteren"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2582,7 +2801,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globale aankondiging:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Muziek volume"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Toewijzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Standaard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibreren"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stoppen"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "laag"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "gemiddeld"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "hoog"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Map"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Winkel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nee"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Naam"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relatie"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutraal"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Vriend"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Genegeerd"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Lettergrootte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Geen tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bellen, geen namen"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bellen met namen"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "uit"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4850,7 +4945,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -4859,61 +4954,21 @@ msgstr "Reset"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4923,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4935,18 +4990,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -4955,7 +5010,7 @@ msgstr "Aanmaken"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
@@ -5012,7 +5067,7 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Naam:"
 
@@ -5063,11 +5118,11 @@ msgstr "Naam:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5076,134 +5131,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Mannelijk"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Vrouwelijk"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bevestig het verwijderen van het personage"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Spelen"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Poort:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5715,62 +5755,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Inloggen"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5847,17 +5877,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Indienen"
 
@@ -5866,9 +5896,9 @@ msgstr "Indienen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -5888,7 +5918,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5904,40 +5934,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Van server wisselen"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5945,128 +5975,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Toepassen"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6095,277 +6125,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Groep"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6407,149 +6437,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Veranderen"
 
@@ -6559,12 +6544,12 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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."
@@ -6576,36 +6561,36 @@ msgid "Name: %s"
 msgstr "Naam: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Actualiseren..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -6635,42 +6620,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6813,163 +6798,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7021,58 +7006,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7080,22 +7065,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7115,290 +7100,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Vaardigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7768,7 +7753,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 7dd5400a4..0ae76bf62 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -22,87 +22,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -110,387 +110,387 @@ msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) aanval"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Weg"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) weg"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) weg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -500,42 +500,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Say '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Blink naam"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Zwevende '...' bel"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Zwevende bel"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -547,13 +547,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Help"
@@ -566,11 +566,11 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Sluiten"
 
@@ -590,17 +590,17 @@ msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -615,83 +615,83 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
@@ -893,25 +893,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -935,65 +935,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Netwerkfout"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "standaard"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "zwart"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "rood"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "groen"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "blauw"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "goud"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "geel"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "roze"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "paars"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "grijs"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "bruin"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "regenboog 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "regenboog 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "regenboog 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Algemene Magie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Levensmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Oorlogsmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Wijzigingsmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Natuursmagie"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astral Magie"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutraal"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Vriend"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Geen rekening mee houden"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Genegeerd"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Gewist"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Geen Doel"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Doel Toestaan"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Heeft Doel Nodig"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normaal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Auto Sluiten"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Overslaan"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Groep: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1001,7 +1222,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Handel"
@@ -1015,49 +1236,49 @@ msgstr "Handel"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1075,9 +1296,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Beweeg"
@@ -1086,7 +1307,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Spreken"
@@ -1097,9 +1318,9 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1110,9 +1331,9 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1120,26 +1341,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1147,7 +1368,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1155,7 +1376,7 @@ msgstr "an de negeerlijst toevoegen"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
@@ -1178,69 +1399,69 @@ msgstr "Naam aan het gesprek toevoegen"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1250,20 +1471,20 @@ msgstr "Hernoem"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1272,77 +1493,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1352,68 +1573,68 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1422,64 +1643,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -1487,57 +1708,56 @@ msgstr "Haal alles op"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(standaard)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -1545,134 +1765,134 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1680,9 +1900,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -1690,22 +1910,22 @@ msgstr "Afdoen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -1713,56 +1933,56 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Schop"
 
@@ -1877,10 +2097,10 @@ msgstr "OK selecteren"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -2442,12 +2662,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Andere"
 
@@ -2467,11 +2687,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -2507,23 +2726,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2531,7 +2750,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2587,7 +2806,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -2613,7 +2832,7 @@ msgstr "Guild leden"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
@@ -2747,99 +2966,39 @@ msgstr "Wegpunt"
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "zwart"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "rood"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "groen"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "blauw"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "goud"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "geel"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "roze"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "paars"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "grijs"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "bruin"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Wijzig"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -2850,30 +3009,30 @@ msgid "Battle"
 msgstr "Gevecht"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globale aankondiging:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2887,157 +3046,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Taal"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Zet audio aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Zet muziek aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Zet spel sfx aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Zet gui sfx aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Muziek volume"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Zet mumble voice chat aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Download muziek"
 
@@ -3060,8 +3215,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -3230,100 +3385,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Vertraging:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Rood:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Groen:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Blauw:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Toewijzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Standaard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3332,50 +3487,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibreren"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stoppen"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3390,279 +3545,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "standaard"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "laag"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "gemiddeld"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "hoog"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Allerlei"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Automatisch enkel bereikbare monsters viseren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Markeer het aanvalsbereik van de monsters"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Toon hp statusbalk van monsters"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Doorloop monsterdoelwitten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Map"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Geef de poort-deeltjes weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Markeer de kaartpoorten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Markeer het aanvalsbereik van de speler"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Toon uitgebreide minimaps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Teken de weg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Teken hotkeys op de kaart"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Bewegen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Automatische positieverbetering"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Aanvallen tijdens verplaatsen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Syncroniseer spelerbeweging"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Gestoorde beweging Een programma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Speler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Doorloop spelerdoelwitten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Geef de job ervarings berichten weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Geef de spelers popups weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "'Weg van het toetsenbord'-bericht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Geef je beroep weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3670,279 +3815,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Winkel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Houd de NPC dialogen bij"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Laag verkeer modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Verberg het schild"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Toon achtergrond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nee"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Hw acceleratie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4023,401 +4168,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Naam"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relatie"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutraal"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Vriend"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Geen rekening mee houden"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Genegeerd"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Gewist"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relaties"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Heel klein (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Klein (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Middelmatig (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normaal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Groot (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "GUI thema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Standaard Lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Taal"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Vet lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Deeltjes lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Help lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Lettergrootte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Thema info"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Klein"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normaal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Middelmatig"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Groot"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Grootte van knoppen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4533,323 +4637,314 @@ msgstr ""
 "resolutie"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Geen tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bellen, geen namen"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bellen met namen"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "uit"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Bovenhoofdse tekst"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Deeltjesdetail"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Wie is online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Bot controle"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "UITR"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Specialen"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "WU"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
@@ -4861,7 +4956,7 @@ msgstr "Bot Controleerder"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -4870,61 +4965,21 @@ msgstr "Reset"
 msgid "Result"
 msgstr "Resultaat"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4934,9 +4989,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4946,18 +5001,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -4966,7 +5021,7 @@ msgstr "Aanmaken"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5014,7 +5069,7 @@ msgstr "De email adres ingaven zijn niet gelijk."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
@@ -5023,7 +5078,7 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -5056,7 +5111,7 @@ msgid "The new password entries mismatch."
 msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5064,9 +5119,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Naam:"
 
@@ -5074,11 +5129,11 @@ msgstr "Naam:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5087,134 +5142,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Mannelijk"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Vrouwelijk"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bevestig het verwijderen van het personage"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Verwissel Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Spelen"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Wijzig Email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5224,48 +5279,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "regenboog 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "regenboog 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "regenboog 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5286,201 +5326,201 @@ msgid "Net"
 msgstr "Net"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Muziek:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Kaart:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minikaart:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Muispunt:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Deeltjesaantal: "
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Aantal kaart-acteurs"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Speler positie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d beelden/sec"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d beelden/sec (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d beelden/sec (normale OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d beelden/sec (veilige OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d beelden/sec (SDL2 standaard)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Textuuraantal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Deeltjes-aantal: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Doel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Doel identificatie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Aanvalsvertraging:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Normale slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Maximum slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Critieke slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Doel niveau:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Doel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Doel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Invoer: %d bytes/sec"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
@@ -5511,61 +5551,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Poort:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Server type:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5575,47 +5615,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -5726,62 +5766,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Auto Sluiten"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Overslaan"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Inloggen"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Onthoud gebruikersnaam"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Update:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Wijzig Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Manuele update server"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5858,17 +5888,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Indienen"
 
@@ -5877,9 +5907,9 @@ msgstr "Indienen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -5899,7 +5929,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Kleren: %d"
@@ -5915,40 +5945,40 @@ msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Van server wisselen"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5956,128 +5986,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "verkoop voorwerp"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Toepassen"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Koop voorwerpen"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Verkoop voorwerpen"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Aankondigingen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
@@ -6106,277 +6136,277 @@ msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Lid uitnodigen bij gilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wie zou u willen uitnodigen in guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Groep"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Groep %s stoppen verzocht."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Lid uitnodigen in groep"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Aanv"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "S"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Guild Naam"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -6418,149 +6448,104 @@ msgstr "Personagepunten: %d"
 msgid "Correction points: %d"
 msgstr "Correctiepunten: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Geen Doel"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Doel Toestaan"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Heeft Doel Nodig"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Algemene Magie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Levensmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Oorlogsmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Wijzigingsmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Natuursmagie"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Astral Magie"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Commando bewerker"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "ander"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symbool:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Commando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Doel Type:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icoon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Magie niveau:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Magie School:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "School niveau:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Bewaren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Veranderen"
 
@@ -6570,12 +6555,12 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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 "
@@ -6588,36 +6573,36 @@ msgid "Name: %s"
 msgstr "Naam: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Actualiseren..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -6647,42 +6632,42 @@ msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Selecteer Wereld"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Wijzig Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Kies Wereld"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6690,7 +6675,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -6825,165 +6810,165 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Sterkte:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agiliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Geluk:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
 "server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Spel"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7035,58 +7020,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Oud wachtwoord is ongeldig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Client is te oud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7096,22 +7081,22 @@ msgstr ""
 "Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd"
 
@@ -7131,13 +7116,13 @@ msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7145,277 +7130,277 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Handel mislukte!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Emoticon gefaald!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Chatcreatie mislukte!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Kan je niet bij de groep voegen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Kan niet roepen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Huh? Wat is dat?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Warp mislukt..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Kon niets stelen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Handigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handelen: Jij en %s"
@@ -7786,7 +7771,7 @@ msgstr "Veilige OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
diff --git a/po/pl.po b/po/pl.po
index 84609458d..2e07d6793 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -25,87 +25,87 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Człowiek"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,387 +114,387 @@ msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "xp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) szalone ruchy numer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) podejdź do celu na zasięg ataku - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) atak"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) atakuj niezaprzyjaźnionych"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) nie atakuj graczy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "AFK"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) AFK"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) stan"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -504,42 +504,42 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Pisz '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Mruganie nicka"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Bąbelek \"...\" nad głową"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Bąbelek nad głową"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr "Wydajność"
 
@@ -551,13 +551,13 @@ msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Pomoc"
@@ -570,11 +570,11 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Zamknij"
 
@@ -594,17 +594,17 @@ msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -619,83 +619,83 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, 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."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Nieprawidłowy host aktualizacyjny: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
@@ -896,25 +896,25 @@ msgstr "%d sekund/y"
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
@@ -937,65 +937,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Błąd sieci"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "domyślnie"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "czarny"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "czerwony"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "zielony"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "niebieski"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "złoty"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "żółty"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "różowy"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "fioletowy"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "szary"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "brązowy"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "tęczowy 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "tęczowy 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "tęczowy 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Ogólna Magia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magia Życia"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magia Wojny"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magia Transmutacji"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magia Natury"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Magia Astralna"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutralny"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Przyjaciel"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Lekceważony"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorowany"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Skasowany"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Dodany/a do czarnej listy"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Wróg"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "nieposortowane"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "po cenie"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "wg. nazwy"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "wg. ID"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "wg. wagi"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "wg. ilości"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "wg. typu"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Bez celu"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Dozwól cel"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Wymaga celu"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normalna"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Automatyczne zamykanie"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Omiń"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupa: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gildia: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Miejsce w PvP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
@@ -1003,7 +1224,7 @@ msgstr "Waga: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Handel"
@@ -1017,49 +1238,49 @@ msgstr "Handel"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Atak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
@@ -1077,9 +1298,9 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Podejdź"
@@ -1088,7 +1309,7 @@ msgstr "Podejdź"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Rozmowa"
@@ -1099,9 +1320,9 @@ msgstr "Rozmowa"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kup"
 
@@ -1112,9 +1333,9 @@ msgstr "Kup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -1122,26 +1343,26 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
@@ -1149,7 +1370,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -1157,7 +1378,7 @@ msgstr "Dodaj do listy ignorowanych"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
@@ -1180,69 +1401,69 @@ msgstr "Wpisz do czatu"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Portal"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -1252,20 +1473,20 @@ msgstr "Zmień nazwę"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
@@ -1274,77 +1495,77 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1354,68 +1575,68 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nick:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Komentarz gracza            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Komentarz:                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -1424,64 +1645,64 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Przechowaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Przechowaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Przechowaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Przechowaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Przechowaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Odbierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Odbierz połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Odbierz wszystko"
 
@@ -1489,57 +1710,56 @@ msgstr "Odbierz wszystko"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(domyślne)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "W dół"
 
@@ -1547,134 +1767,134 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Pokaż okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imituj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
@@ -1682,9 +1902,9 @@ msgstr "Chroń przedmiot"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -1692,22 +1912,22 @@ msgstr "Zdejmij"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -1715,56 +1935,56 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Podziel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Wyrzuć"
 
@@ -1879,10 +2099,10 @@ msgstr "Wybrano OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -2444,12 +2664,12 @@ msgstr "Page down"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Inne"
 
@@ -2469,11 +2689,10 @@ msgstr "Wybierz2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2509,23 +2728,23 @@ msgstr "Podstawowe"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Skróty"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Okna"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Emotki"
 
@@ -2533,7 +2752,7 @@ msgstr "Emotki"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Czat"
 
@@ -2589,7 +2808,7 @@ msgstr "NPC"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Potwory"
 
@@ -2615,7 +2834,7 @@ msgstr "Członkowie Gildii"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efekty cząsteczkowe"
 
@@ -2749,99 +2968,39 @@ msgstr "Drogowskaz"
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Poziom: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "czarny"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "czerwony"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "zielony"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "niebieski"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "złoty"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "żółty"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "różowy"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "fioletowy"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "szary"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "brązowy"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Ekw."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Otwórz adres url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -2852,30 +3011,30 @@ msgid "Battle"
 msgstr "Bitwa"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Ogłoszenie ogólne:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Ogłoszenie ogólne od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s jest teraz Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s jest teraz Offline."
@@ -2889,157 +3048,153 @@ msgstr "GM"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gildia"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Język"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(bez dźwięku)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Dźwięk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Podstawowe ustawienia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Włącz dźwięk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Włącz muzykę"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Włącz efekty gry"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Włącz efekty GUI"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Aktywuj ściszanie się muzyki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Częstotliwość audio"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "stereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "surround+center+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Kanały audio"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Efekty dźwiękowe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Dźwięk okienka informacyjnego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Dźwięk wzywania okienka"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Dźwięk szeptów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Dźwięk wiadomości z gildii/ drużyny"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Dźwięk podświetlanej wiadomości"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Dźwięk globalnej wiadomości"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Dźwięk wiadomosci o błędzie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Dźwięk powiadomienia o handlu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Pokaż okno dźwięku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Ukryj okno dźwięku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Włącz integrację z Mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Ściągnij muzykę"
 
@@ -3062,8 +3217,8 @@ msgstr "Podtrzymuj skupienie na pasek czatu."
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Kolory"
 
@@ -3232,100 +3387,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Opóźnienie:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Czerwony:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Zielony:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Niebieski:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statyczny"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsujący"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Tęcza"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Widmo"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Przypisz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Odznacz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Domyślne"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Zresetuj wszystkie klawisze"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Wejście"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3336,50 +3491,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "nieznane"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibruj"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Wykryj dżojstiki"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Używaj joysticka jeśli okno klienta nieaktywne"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Obracaj drążkiem i nie naciskaj przycisków"
 
@@ -3394,279 +3549,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Zawsze pokazuj"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Autoukrywanie w małej rozdzielczości"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Autoukrywanie"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Proxy systemowe"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Bezpośrednie połączenie"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "Nazwa hosta SOCKS5"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "domyślnie"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "niskie"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "średnie"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "wysokie"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "xduża"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "xxduża"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Różne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Pokaż zadane potworom obrażenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Automatycznie namierzaj tylko dosięgalne potwory"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Podświetl zasięg ataku potworów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Pokazuj pasek życia potworów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Przewijaj namierzanie potworów"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Włącz efekty portali"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Podświetl portale na mapie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Podświetl przedmioty na podłodze"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Podświetl zasięg ataku graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Pokaż rozszerzone minimapy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Rysuj ścieżkę"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Rysuj klawisze skrótu na mapie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Włącz leniwe przewijanie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Leniwość przewijania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Promień przewijania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Automatycznie zmieniaj rozmiar minimap"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Poruszanie się"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Koryguj pozycję automatycznie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Atakuj podczas poruszania się"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Atakuj następny cel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Synchronizuj ruchy graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Szalone ruchy: program A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Ruchy relatywne myszką (zalecane do interfejsów dotykowych)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Gracze"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Pokazuj własny pasek życia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Włącz szybkie statystyki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Przewijaj namierzanie graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Pokazuj wyskakujące powiadomienia graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Wiadomość AFK"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Pokazuj poziom umiejętności"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Filtruj ataki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Włącz filtr podnoszenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Włącz protokół reklamowy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Aktywuj powiadomienia dotyczące wagi."
 
@@ -3674,279 +3819,279 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Sklep"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Akceptuj prośby o handel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Włącz tryb sklepu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Przewijaj namierzanie NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Loguj dialogi NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Integracja z botami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Włącz integrację z AuctionBotem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Klawiatura"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Opóźnienie powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Interwał powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Własny interwał powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Guziki skrótów"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Rodzaj proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Adres serwera:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr "Aktywuj podwójne kliknięcia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Włącz logowanie OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Aktywuj logowanie wejścia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Chowaj obrazek tarczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Opóźnienie sieci między podserwerami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Pokazuj tło"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Nadpisanie gęstości ekranu"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr "Lepsza wydajność (włącz by uzyskać lepszą wydajność)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr "Automatycznie dopasuj ustawienia jakości"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Przyspieszenie Hw"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr "Włącz cache przezroczystości (Software, może zużyć dużo pamięci)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Włącz redukowanie map (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Włącz opóźnienie elementów spritów (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Włącz stopniowe ładowanie obrazków (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Aktywuj sampler tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr "Lepsza jakość (wyłącz dla lepszej wydajności)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Napraw kanał alfa (Software, może bardzo spowolniać)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Pokaż przezroczystość istot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Włącz reorganizację obrazków"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Zmniejszenie zużycia pamięci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Wyłącz zaawansowany cache istot (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Wyłącz cache istot (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr "Różne opcje (włączenie lub wyłączenie może poprawić wydajność)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Włącz roszerzenie prostokątnych tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Użuj nowy wewnętrzny format tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Aktywuj atlasy tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr "Umieszczaj w cache wszystkie sprite'y mapy (może zużyć więcej pamięci)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4027,401 +4172,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Imię"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relacja"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutralny"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Przyjaciel"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Lekceważony"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorowany"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Skasowany"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Dodany/a do czarnej listy"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Wróg"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relacje"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Bardzo mała (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Bardzo mały (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Bardzo mała (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Mała (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Średnia (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normalny (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Duży (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Ogromna (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Wielka (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Duża (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Duża (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Duża (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Bardzo duża (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Bardzo duża (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Niezmiernie ogromna (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Chinese (China)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Czech"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "English"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finnish"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "French"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "German"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonesian"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Włoski"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polish"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japanese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Dutch (Belgium/Flemish)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portuguese"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguese (Brazilian)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Russian"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Spanish (Castilian)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Turecki"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Skórka GUI"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Główna czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Język"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Pogrubiona czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Czcionka efektów"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Czcionka pomocy"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Bezpieczna czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Japońska czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Rozmiar czcionki Npc"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Nazwa:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Informacje o Skórce"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Skórka zmieniona"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Małe"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normalna"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Średnie"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Duże"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Dotyk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Klawiatura ekranowa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Pokaż ikonę klawiatury ekranowej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Działanie ikony klawiatury"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Dżojstik ekranowy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Pokaż dżojstik ekranowy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Rozmiar dżojstika"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Przyciski ekranowe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Pokaż przyciski ekranowe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Format przycisków"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Rozmiar przycisków"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Działanie przycisku %u"
@@ -4536,323 +4640,314 @@ msgstr ""
 "rozdzielczości."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Brak tekstu"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bąbelki, brak imion"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bąbelki z imionami"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "wyłączone"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "najlepsza jakość"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "normalnie"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr "najlepsza wydajność"
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "włączone"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Obraz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Powiadomienia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Pokazuj wiadomości o podnoszeniu w czacie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Pokazuj wiadomości o podnoszeniu jako cząsteczki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Efekty"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Przechwytuj sygnały z myszki i klawiatury"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Blurowanie tekstur (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Tekst nad głową"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Efekty otoczenia"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "najlepsze"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detale cząsteczkowe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Fizyka cząsteczek"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Aktywuj ustawienia gammy."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Wycentruj okno gry"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Pozwól na włączanie się wygaszacza ekranu"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Gracze online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "PMC"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "OM"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Misje"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "WB"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Wykrywacz botów"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "SB"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Emotki"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "TX"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Stan"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EKW"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Ekwipunek"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INW"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inwentarz"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Zdolności"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Specjalne"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Społeczność"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "MG"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "WŻ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Czy wiesz, że..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "SKP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "SÓ"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
@@ -4864,7 +4959,7 @@ msgstr "Wykrywacz botów"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -4873,61 +4968,21 @@ msgstr "Resetuj"
 msgid "Result"
 msgstr "Rezultat"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "nieposortowane"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "po cenie"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "wg. nazwy"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "wg. ID"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "wg. wagi"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "wg. ilości"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "wg. typu"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr "Utwórz przedmioty"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Ilość:"
 
@@ -4937,9 +4992,9 @@ msgstr "Ilość:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4949,18 +5004,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Utwórz"
 
@@ -4969,7 +5024,7 @@ msgstr "Utwórz"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5017,7 +5072,7 @@ msgstr "Pola adresu e-mail się nie zgadzają."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Zmień hasło"
 
@@ -5026,7 +5081,7 @@ msgstr "Zmień hasło"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Hasło:"
@@ -5059,7 +5114,7 @@ msgid "The new password entries mismatch."
 msgstr "Potwierdzenie hasła nie zgadza się."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Nowa postać"
 
@@ -5067,9 +5122,9 @@ msgstr "Nowa postać"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -5077,11 +5132,11 @@ msgstr "Nazwa:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5090,134 +5145,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Kolor włosów:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Fryzura:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Mężczyzna"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Kobieta"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr "Wygląd:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potwierdź usunięcie postaci"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewny/a, że chcesz usunąć tę postać?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Konto %s (czas poprzedniego zalogowania %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Przeloguj się"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Graj"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Konto: %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5232,48 +5287,33 @@ msgstr ""
 "Doświadczenie: %u\n"
 "Pieniądze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "tęczowy 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "tęczowy 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "tęczowy 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5294,201 +5334,201 @@ msgid "Net"
 msgstr "Sieć"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Muzyka:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Mini-mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Kursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Licznik cząsteczek:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Licznik aktorów na mapie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Pozycja gracza:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Wywołania rysowania:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr "Połączenia z teksturami:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (bezpieczny OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobilny OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 domyślne)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Licznik tekstur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Licznik cząsteczek: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Cel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "ID celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Rodzaj celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Poziom celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Rasa celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Drużyna celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Gildia celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Opóźnienie ataku:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Najsłabsze uderzenie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Najmocniejsze uderzenie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Uderzenie krytyczne:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Poziom celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Grupa celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Gildia celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Wejście: %d bajtów"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Wyjście: %d bajtów"
@@ -5519,61 +5559,61 @@ msgstr "Otwieraj to okno automatycznie"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Edytuj serwer"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Połącz"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Adres:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Typ serwera:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Opis:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "Adres strony z graczami online:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr "Normalna czcionka"
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr "Czcionki"
 
@@ -5583,47 +5623,47 @@ msgid "Did you know..."
 msgstr "Czy wiesz, że..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "wszystkie"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do odbioru."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Nieznany obiekt"
 
@@ -5736,62 +5776,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "Jack-O spawnuje się"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Automatyczne zamykanie"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Omiń"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Zaloguj się"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Zapamiętaj login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Aktualizacja:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Zmień serwer"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Rejestruj"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Zaawansowane ustawienia aktualizacji"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Serwer:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Host aktualizacji: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Otwórz stronę z rejestracją"
 
@@ -5868,17 +5898,17 @@ msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Zatwierdź"
 
@@ -5887,9 +5917,9 @@ msgstr "Zatwierdź"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Dodaj"
 
@@ -5909,7 +5939,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Strój: %d"
@@ -5925,40 +5955,40 @@ msgid "Away outfit"
 msgstr "Strój na afk"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Zmień serwer"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Zmień postać"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Nazwa użytkownika musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Nazwa użytkownika musi być krótsza niż %u znaków."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5966,128 +5996,128 @@ msgstr "Hasło musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Hasło musi mieć mniej znaków niż %u."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "sprzedaj przedmiot"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Czy naprawdę chcesz sprzedać %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Załaduj"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Zastosuj"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Kupuj"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Sprzedaj"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Ogłoś"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Pokazuj linki w ogłoszeniach"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Aukcja"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
@@ -6116,277 +6146,277 @@ msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Poproszono o wyjście z gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Zaproszenie do gildii"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kogo chcesz zaprosić do gildii %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Opuścić gildię?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Członkowie: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Gracze: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grupa"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr "Widoczni gracze: %d"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "GPS"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portale: %u/%u"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pod"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Podnoś przedmioty"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignoruj przedmioty"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Przyjaciele: %u/%u"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -6428,149 +6458,104 @@ msgstr "Punkty postaci: %d"
 msgid "Correction points: %d"
 msgstr "Punkty korekcyjne: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Bez celu"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Dozwól cel"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Wymaga celu"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Ogólna Magia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magia Życia"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magia Wojny"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magia Transmutacji"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magia Natury"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magia Astralna"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Edytor poleceń"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "inne"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Polecenie:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Komentarz:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Rodzaj celu:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Ikona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Poziom magii:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Szkoła magii:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Poziom szkoły:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Zachowaj"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Oferuj handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Potwierdzono. Oczekiwanie..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Akceptuj handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Zaakceptowano. Oczekiwanie..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Zmień"
 
@@ -6580,12 +6565,12 @@ msgid "You give:"
 msgstr "Dajesz:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
@@ -6598,36 +6583,36 @@ msgid "Name: %s"
 msgstr "Imię: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -6657,42 +6642,42 @@ msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Wybierz świat"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Przeloguj się"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Wybierz świat"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6700,7 +6685,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -6835,163 +6820,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Siła:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Szybkość:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Witalność:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Zręczność:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Szczęście:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Odmowa wstępu. Prawdopodobnie serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Nie można użyć tego ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Nieznany błąd serwera postaci."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Nieprawidłowe imię."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Nieprawidłowe staty."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Nieprawidłowe włosy."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Nieprawidłowe miejsce inwentarza."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Nieprawidłowa rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr "Niewłaściwy wygląd."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Postać skasowana."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Szept nie mógł zostać wysłany, %s jest offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Gra"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Żądanie wyjścia odrzucone!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nazwa gildii: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Przywódca gildii: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Poziom gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Członkowie online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Maksymalna ilość członków: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Przeciętny poziom: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Punkty doświadczenie gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Punkty doświadczenia do następnego poziomu gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Zamek gildii: %s"
@@ -7045,58 +7030,58 @@ msgid "Experience sharing unknown."
 msgstr "Nieznany stan podziału doświadczenia."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Konto nie znalezione. Prosimy się przelogować."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Stare hasło nieprawidłowe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Ważność konta wygasła."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Nie przyjęty przez serwer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Klient jest zbyt nieaktualny."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7106,22 +7091,22 @@ msgstr ""
 "Prosimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Login jest już w użyciu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Nieprawidłowy adres e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
@@ -7141,292 +7126,292 @@ msgid "Connection to server terminated. "
 msgstr "Połączenie z serwerem przerwane."
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Wiadomość"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 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."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 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ć "
 "zdrowie."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Handel zakończony niepowodzeniem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Emotka nieudana!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Nie można usiąść!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Nie można stworzyć czatu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Nie udało się dołączyć do grupy!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Nie można krzyczeć!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nie masz jeszcze wymaganego poziomu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Zbyt niskie HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "Zbyt niska mana!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Nie masz notek!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Nie możesz tego teraz zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Chyba brak Ci kasy... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Niesiesz za duży ciężar by to zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Eee? A to to co?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Nie udało się przeteleportować..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Nie udało się niczego ukraść..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr "Siła %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr "Zwinność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr "Żywotność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencja %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr "Celność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr "Szczęście %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć konta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Wykryto speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Zduplikowany login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Siła"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Zwinność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Witalność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Inteligencja"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Zręczność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Szczęście"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Obrona"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Atak mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Obrona mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% celności"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% uników"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% ciosów kryt."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Opóźnienie ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Opóźnienie chodu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Zasięg ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s chce handlować z Tobą, zgadzasz się?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handel: Ty i %s"
@@ -7800,7 +7785,7 @@ msgstr "Bezpieczny OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nienazwany"
 
diff --git a/po/pt.po b/po/pt.po
index 58e093536..9c95164a1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -23,87 +23,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,387 +111,387 @@ msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "exp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimento louco numero %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Mover até o alvo em distancia de ataque-1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Indisponivel "
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) Ausente"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) Ausente"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -501,42 +501,42 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Piscar nome"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -548,13 +548,13 @@ msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ajuda"
@@ -567,11 +567,11 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Fechar"
 
@@ -591,17 +591,17 @@ msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -616,83 +616,83 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, 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."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
@@ -894,25 +894,25 @@ msgstr "%d segundos"
 msgid "Environment variables dumped"
 msgstr "Variáveis ​​de ambiente despejadas"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -936,65 +936,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Erro de conexão"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "padrão"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "preto"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "vermelho"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "verde"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "azul"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "ouro"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "amarelo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "roxo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "cinza"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "marrom"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "arco-íris 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "arco-íris 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "arco-íris 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Magia geral"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magia Vida"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magia Guerra"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magia Transmutação"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magia Natureza"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Magia Astral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutro"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Amigo(a)"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Desconsiderado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Apagado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Na Lista Negra "
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Inimigo"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "Desordenado"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "por preço"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "por nome"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "por id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "por peso"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "por quantidade"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "por tipo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Sem alvo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Permitir alvo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Precisa de alvo"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Fechar"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Passar"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Posição no PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1002,7 +1223,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Negócios"
@@ -1016,49 +1237,49 @@ msgstr "Negócios"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1076,9 +1297,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Mover"
@@ -1087,7 +1308,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Falar"
@@ -1098,9 +1319,9 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1111,9 +1332,9 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Vender"
 
@@ -1121,26 +1342,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1148,7 +1369,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1156,7 +1377,7 @@ msgstr "Adicionar a lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
@@ -1179,69 +1400,69 @@ msgstr "Adicionar nome ao chat"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1251,20 +1472,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1273,77 +1494,77 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Sair"
 
@@ -1353,68 +1574,68 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Comentário:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1423,64 +1644,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -1488,57 +1709,56 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(padrão)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -1546,134 +1766,134 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Mostrar janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1681,9 +1901,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1691,22 +1911,22 @@ msgstr "Desequipar"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -1714,56 +1934,56 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Chutar"
 
@@ -1878,10 +2098,10 @@ msgstr "Selecionar OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Sair"
 
@@ -2443,12 +2663,12 @@ msgstr "Page down"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Outro"
 
@@ -2468,11 +2688,10 @@ msgstr "Selecionar2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Excluir"
 
@@ -2508,23 +2727,23 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Janelas"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Emoções"
 
@@ -2532,7 +2751,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2588,7 +2807,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstros"
 
@@ -2614,7 +2833,7 @@ msgstr "Membros da guilda"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
@@ -2748,99 +2967,39 @@ msgstr "Ponto de estrada"
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "preto"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "vermelho"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "verde"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "azul"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "ouro"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "amarelo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "roxo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "cinza"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "marrom"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Abrir URL"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -2851,30 +3010,30 @@ msgid "Battle"
 msgstr "Batalha"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s está online"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s está offline"
@@ -2888,157 +3047,153 @@ msgstr "GM"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guilda"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Linguagem"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(sem som)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Áudio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Configurações básicas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Habilitar Áudio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Habilitar música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Habilitar sfx do jogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Habilitar gui sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volume da Música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Habilitar desaparecimento gradual de música "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Frequência de Áudio"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "stereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "surround+center+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Canais de áudio"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Efeitos de som"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Som do diálogo de informação"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Som de pedidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Som de mensagens de susurros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Som de mensagem de Guilda / Grupo "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Destacar som de mensagens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Som de mensagens globais"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Som de mensagens de erro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Som de pedidos de troca"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Mostrar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Ocultar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Baixar músicas"
 
@@ -3061,8 +3216,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Cores"
 
@@ -3231,100 +3386,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Atraso:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Vermelho:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Verde:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Azul:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Atribuir"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Padrão"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3335,50 +3490,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "desconhecido"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Detectar joysticks"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Usar joystick se a janela do jogo estiver inativa"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Parar"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Gire o bastão sem precionar botões"
 
@@ -3393,279 +3548,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Sempre mostrar"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Sempre alto ocultar"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Proxy de sistema"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Conexão Direta"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "padrão"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "Baixo"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "médio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "xalta"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "xxalta"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Diversos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Habilitar rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Velocidade de rolagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Auto redimensionar mapas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Movendo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Atacar próximo alvo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Movimentos relativos do mouse (bom para interfaces de toque)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Mostrar job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de pegar itens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Habilitar notificações de peso"
 
@@ -3673,279 +3818,279 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Loja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Alvo de NPC em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Suporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetição customizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Botões de atalho"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Servidor Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre os sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Substituição de densidade de tela"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Não"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Habilitar redução de mapa (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Habilitar atraso de sprite composto (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Ativar atraso em carregamento de imagens (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Ativar amostrador de textura (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Habilitar reordenar sprites"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Menos memória (Habilite para menos uso de memória)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Desabilitar cache avançado (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Desabilitar cache (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Habilitar a extensão textura retangular (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Utilizar nova textura de formato interno (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Ativar atlas de textura (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr "Armazena todos sprites do mapa (pode usar a memória adicional)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4026,401 +4171,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nome"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relação"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutro"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Amigo(a)"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Desconsiderado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Apagado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Na Lista Negra "
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Inimigo"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relações"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Muito pequeno (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Muito pequeno (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Largo (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Largo (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Largo (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Grande (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Grande (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Grande (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Muito Grande (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Muito Grande (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Muito Grande (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Chinês (China)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Tcheco"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Inglês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finlandês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Francês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Alemão"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polonês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japonês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holandês (Bélgica / Flandres)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Português"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Russo"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Espanhol (castelhano)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Turco"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Linguagem"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Fonte negrito"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Fonte Segura"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Font Jasponesa"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Tamanho da fonte de NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Nome:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "direitos autorais:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Informação de Temas"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Pequeno"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Médio"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Largo"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Toque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Teclado na tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Mostrar ícone de teclado na tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Ação do ícone de teclado"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Controle na tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Mostrar controle na tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Tamanho do joystick"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Botões na tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Mostrar botões na tela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Formato dos botões"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Tamanho do botão"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Ação do botão %u"
@@ -4534,323 +4638,314 @@ msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Sem texto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Texto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "Desligado"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "Melhor qualidade"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "normal"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "on"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Notificações"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Mostar notificações de coleta no chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Mostrar notificações de coleta como efeito de particulas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Efeitos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Pegue a entrada do mouse e teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Texturas borradas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Transparência de janelas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Física de partículas"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Habilitar controle de gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centro de janela do jogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Permitir proteção de tela"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Quem esta online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "AJD"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "MSS"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Missões"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "AB"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Analisador de bot"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "EST"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Smileys"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "JC"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Habilidades"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Especiais"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "VS"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Você sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -4862,7 +4957,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetar"
 
@@ -4871,61 +4966,21 @@ msgstr "Resetar"
 msgid "Result"
 msgstr "Resultado"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "Desordenado"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "por preço"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "por nome"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "por id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "por peso"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "por quantidade"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "por tipo"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Quantidade:"
 
@@ -4935,9 +4990,9 @@ msgstr "Quantidade:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4947,18 +5002,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Criar"
 
@@ -4967,7 +5022,7 @@ msgstr "Criar"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5015,7 +5070,7 @@ msgstr "Os emails informados não são iguais."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -5024,7 +5079,7 @@ msgstr "Alterar senha"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Senha:"
@@ -5057,7 +5112,7 @@ msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Novo Pesonagem"
 
@@ -5065,9 +5120,9 @@ msgstr "Novo Pesonagem"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nome:"
 
@@ -5075,11 +5130,11 @@ msgstr "Nome:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5088,134 +5143,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Mulher"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Conta %s (Logado pela última vez em %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Jogar"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5230,48 +5285,33 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "arco-íris 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "arco-íris 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "arco-íris 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5292,201 +5332,201 @@ msgid "Net"
 msgstr "Rede"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Cursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Contador de Particulas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Jogadores no mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Sua posição:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Marcar caminho:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr "Conjunto de texturas:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (OpenGL móvel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Contador de Texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Level do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Corrida do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Guilda de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Atraso de Ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Dano Minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Dano Máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Dano Crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -5517,61 +5557,61 @@ msgstr "Abrir automaticamente esta janela"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Endereço:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Porta:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Descrição:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "URL de lista onlines:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5581,47 +5621,47 @@ msgid "Did you know..."
 msgstr "Você Sabia..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -5732,62 +5772,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Fechar"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Passar"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Atualização:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Atualizando Servidores: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Abrir URL de cadastro"
 
@@ -5864,17 +5894,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5883,9 +5913,9 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Adicionar"
 
@@ -5905,7 +5935,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
@@ -5921,40 +5951,40 @@ msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O Usuários deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O Usuário  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5962,128 +5992,128 @@ msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A nova senha  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "Vender item"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Você realmente deseja vender %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Aplicar"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Comprar itens"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Vender itens"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Leilão"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -6112,277 +6142,277 @@ msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grupo"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atq"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Pegar itens"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Criar grupo"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -6424,149 +6454,104 @@ msgstr "Pontos do personagem: %d"
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Sem alvo"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Permitir alvo"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Precisa de alvo"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Magia geral"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magia Vida"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magia Guerra"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magia Transmutação"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magia Natureza"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magia Astral"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "Feitiço"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "Outro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Símbolo: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icone:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Nível da escola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Salvar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Propor negócio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Mudar"
 
@@ -6576,12 +6561,12 @@ msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -6593,36 +6578,36 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Atualizando..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Concluído"
 
@@ -6652,42 +6637,42 @@ msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6695,7 +6680,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "Tecla u"
 
@@ -6835,163 +6820,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "-O --no-opengl : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Força:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Sorte:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Corrida incorreta:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Jogo"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Mestre da guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nível Guilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Membros Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Membros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Nível médio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guilda exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guilda prox. exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
@@ -7043,47 +7028,47 @@ msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7091,12 +7076,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7106,22 +7091,22 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Server lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
@@ -7141,13 +7126,13 @@ msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7155,279 +7140,279 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 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 "
 "novamente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Falha no emoticon!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Negociação: Você e %s"
@@ -7798,7 +7783,7 @@ msgstr "Seguro OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f0973838b..bf8d707c8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -29,87 +29,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 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/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,387 +117,387 @@ msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "exp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimento louco número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Mover ao alvo em alcance de ataque -1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Indisponivel "
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) Modo Ausente"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) Ausente"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -507,42 +507,42 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Piscar nome"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -554,13 +554,13 @@ msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ajuda"
@@ -573,11 +573,11 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Fechar"
 
@@ -597,17 +597,17 @@ msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -622,83 +622,83 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, 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."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Host de atualização inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
@@ -900,25 +900,25 @@ msgstr "%d Segundos"
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -942,65 +942,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Erro de conexão"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "padrão"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "preto"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "vermelho"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "verde"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "azul"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "ouro"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "amarelo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "roxo"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "cinza"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "marrom"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "arco-íris 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "arco-íris 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "arco-íris 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Magia geral"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Magia Vida"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Magia Guerra"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Magia Transmutação"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Magia Natureza"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Magia Astral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutro"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Amigo(a)"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Desconsiderado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Apagado"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Na Lista Negra "
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Inimigo"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "Desordenado"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "por preço"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "por nome"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "por id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "por peso"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "por quantidade"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "por tipo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Sem alvo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Permitir alvo"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Precisa de alvo"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Fechar"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Passar"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Posição no PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1008,7 +1229,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Negócios"
@@ -1022,49 +1243,49 @@ msgstr "Negócios"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1082,9 +1303,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Mover"
@@ -1093,7 +1314,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Falar"
@@ -1104,9 +1325,9 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1117,9 +1338,9 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Vender"
 
@@ -1127,26 +1348,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Add comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1154,7 +1375,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1162,7 +1383,7 @@ msgstr "Adicionar a lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
@@ -1185,69 +1406,69 @@ msgstr "Adicionar nome ao chat"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1257,20 +1478,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Mover câmera "
 
@@ -1279,77 +1500,77 @@ msgstr "Mover câmera "
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Sair"
 
@@ -1359,68 +1580,68 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Comentário:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1429,64 +1650,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -1494,57 +1715,56 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(padrão)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -1552,134 +1772,134 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Mostrar Janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr "Proteger item"
 
@@ -1687,9 +1907,9 @@ msgstr "Proteger item"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1697,22 +1917,22 @@ msgstr "Desequipar"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -1720,56 +1940,56 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr "Checar ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Chutar"
 
@@ -1884,10 +2104,10 @@ msgstr "Selecionar OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Sair"
 
@@ -2449,12 +2669,12 @@ msgstr "Page down"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Outro"
 
@@ -2474,11 +2694,10 @@ msgstr "Selecionar2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Excluir"
 
@@ -2514,23 +2733,23 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Janelas"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Emoções"
 
@@ -2538,7 +2757,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2594,7 +2813,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monstros"
 
@@ -2620,7 +2839,7 @@ msgstr "Membros da guilda"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
@@ -2754,99 +2973,39 @@ msgstr "Ponto de estrada"
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "preto"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "vermelho"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "verde"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "azul"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "ouro"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "amarelo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "roxo"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "cinza"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "marrom"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Abrir URL"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -2857,30 +3016,30 @@ msgid "Battle"
 msgstr "Batalha"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s estão online"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s estão offline"
@@ -2894,157 +3053,153 @@ msgstr "GM"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guilda"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Idioma"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(sem som)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Áudio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Configurações básicas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Habilitar Áudio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Habilitar música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Habilitar sfx do jogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Habilitar gui sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Volume da Música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Habilitar desaparecimento gradual da música"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Freqüência de áudio"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "estereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surrond"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "surrond+center+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Canais de Áudio"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Efeitos de som"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Som de dialogo de informação"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Requisitar som de dialogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Som de mensagem de susurros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Som de mensagem Guilda / Grupo "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Destacar som de mensagem "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Som de anuncios globais"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Som de mensagem de erro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Som de convites de troca"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Mostrar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Ocultar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Baixar músicas"
 
@@ -3067,8 +3222,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Cores"
 
@@ -3237,100 +3392,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Atraso:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Vermelho:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Verde:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Azul:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Atribuir"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Padrão"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3341,50 +3496,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "desconhecido"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Detectar joysticks"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Usar joystick se a janela do jogo estiver inativa"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Parar"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Girar o bastão e não pressionar os botões"
 
@@ -3399,279 +3554,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Sempre mostrar"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Sempre ocultar"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Sistema proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Conexão direta"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "padrão"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "baixo"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "médio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "xalta"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "xxalta"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Diversos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Habilitar rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Velocidade de rolagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Redirecionamento automático de mapas "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Movendo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Atacar próximo ao alvo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Movimentos relativos ao mouse (bom para interfaces de toque)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Mostrar job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de captura"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Habilitar notificações de peso"
 
@@ -3679,280 +3824,280 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Loja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Alvo NPC em ciclos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Suporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Ativar suporte ao auction bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetição personalizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "botões de atalho"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr "Habilitar duplo clique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Ultrapassar Densidade da tela "
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Não"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Habilitar redução de mapa (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Habilitar atraso composto de sprite (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Ativar carregamento imagens atrasados (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Ativar exemplos de texturas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Habilitar reordenar sprites."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Menos memória (habilite para usar menos memória)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Desabilitar cache avançado (Software)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Desabilitar cache (Software)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Habilitar extensão de texturas retangulares (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Usar nova textura de formato interno (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Ativar atlas de textura (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 "Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4033,401 +4178,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Nome"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relação"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutro"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Amigo(a)"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Desconsiderado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Apagado"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Na Lista Negra "
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Inimigo"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relações"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Muito pequena (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Muito pequeno (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Largo (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Larga (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Larga (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Grande (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Grande (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Grande (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Muito Grande (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Muito Grande (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Muito Grande (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Chinês(China)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Tcheco"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Inglês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finlandês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Francês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Alemão"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polonês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japonês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holandês"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Português"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Russo"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Espanhol"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Turco"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Linguagem"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Fonte negrito"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Fonte segura"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Fontes japonesas"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Tamanho de fonte de NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Nome:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Direitos Autorais:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Informação de Tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Pequeno"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Médio"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Grande"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Toque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Teclado virtual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Mostrar ícone do teclado virtual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Ação do ícone do teclado"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Joystick virtual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Mostrar joystick virtual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Tamanho do joystick"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Botões virtuais"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Mostrar botões virtuais"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Formato dos botões"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Tamanho dos botões"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Ação do botão %u"
@@ -4541,323 +4645,314 @@ msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Sem texto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Texto"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "Desligado"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "Melhor qualidade"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "normal"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "on"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Notificações"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Mostrar notificações de coleta no bate-papo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Mostrar notificações de coleta como particula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Efeitos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Pegue a entrada do mouse e teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Texturas borradas (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Transparência de janelas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Física de partículas"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Habilitar controle gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centro da janela de jogo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Permitir rodar proteção de tela"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Quem esta online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "AJU"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "MSS"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Missões"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "AB"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Analisador de bot"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "EST"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Smileys:"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Habilidades"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Especiais"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Você Sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "LOJ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "RO"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -4869,7 +4964,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetar"
 
@@ -4878,61 +4973,21 @@ msgstr "Resetar"
 msgid "Result"
 msgstr "Resultado"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "Desordenado"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "por preço"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "por nome"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "por id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "por peso"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "por quantidade"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "por tipo"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr "Criar itens"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Quantidade:"
 
@@ -4942,9 +4997,9 @@ msgstr "Quantidade:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4954,18 +5009,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Criar"
 
@@ -4974,7 +5029,7 @@ msgstr "Criar"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5022,7 +5077,7 @@ msgstr "Os emails informados não são iguais."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -5031,7 +5086,7 @@ msgstr "Alterar senha"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Senha:"
@@ -5064,7 +5119,7 @@ msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Novo Personagem"
 
@@ -5072,9 +5127,9 @@ msgstr "Novo Personagem"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Nome:"
 
@@ -5082,11 +5137,11 @@ msgstr "Nome:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5095,134 +5150,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Mulher"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr "Aparência:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Conta %s (Último acesso em %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Jogar"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5237,48 +5292,33 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "arco-íris 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "arco-íris 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "arco-íris 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5299,201 +5339,201 @@ msgid "Net"
 msgstr "Rede"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Cursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Contador de particulas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Jogadores no mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Sua posição:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Chamadas de desenho:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr "União de Texturas:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Contador de texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Level do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Raça do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Atarso de ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Hit minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Hit máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Hit crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -5524,61 +5564,61 @@ msgstr "Auto abrir esta janela"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Endereço:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Porta:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Descrição:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "URL de lista online:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5588,47 +5628,47 @@ msgid "Did you know..."
 msgstr "Você sabia que ..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -5739,62 +5779,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Fechar"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Passar"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Atualização:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Atualizando Servidor: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Abrir endereço de registro"
 
@@ -5871,17 +5901,17 @@ msgid "Job level: %d"
 msgstr "Nível Job: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5890,9 +5920,9 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Adicionar"
 
@@ -5912,7 +5942,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
@@ -5928,40 +5958,40 @@ msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O nome do usuário precisa ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O nome do usuário deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5969,128 +5999,128 @@ msgstr "A senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A senha deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "Vender itens"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Você realmente quer vender: %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Aplicar"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Comprar itens"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Vender itens"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Leilão"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -6119,277 +6149,277 @@ msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grupo"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Ataque"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Pegar itens"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Criar grupo"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -6431,149 +6461,104 @@ msgstr "Pontos do personagem: %d"
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Sem alvo"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Permitir alvo"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Precisa de alvo"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Magia geral"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Magia Vida"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Magia Guerra"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Magia Transmutação"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Magia Natureza"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Magia Astral"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "Feitiço"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "Outro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Símbolo: "
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Icone:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Nível da escola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Salvar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Propor negócio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Mudar"
 
@@ -6583,12 +6568,12 @@ msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -6600,36 +6585,36 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Atualizando..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Concluído"
 
@@ -6659,42 +6644,42 @@ msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6702,7 +6687,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla u"
 
@@ -6841,163 +6826,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "-O --no-opengl : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Força:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Sorte:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr "Aparência incorreta."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Jogo"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Mestre da guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nível Guilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Membros Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Membros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Nível médio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guilda exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guilda prox. exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
@@ -7049,47 +7034,47 @@ msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7097,12 +7082,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7112,22 +7097,22 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Servidor lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente. "
 
@@ -7147,13 +7132,13 @@ msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7161,279 +7146,279 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 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 "
 "novamente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Falha no emoticon!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr "Força %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Negociação: Você e %s"
@@ -7804,7 +7789,7 @@ msgstr "Seguro OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
diff --git a/po/ru.po b/po/ru.po
index 30c15e1ec..92289a1c4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 09:12+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -28,87 +28,87 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Человек"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "уклонение"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "Б"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Вас убил %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,387 +117,387 @@ msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "опыт"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумасшедшими движениями"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумасшедшими движениями"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумасшедшие движения"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) сумасшедшее движение %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумасшедшие движения"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) движение к цели на расстояние атаки - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) атаковать всех кроме друзей"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) не атаковать игроков"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Отошел"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) отошел"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -507,42 +507,42 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Печатать '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Мигать именем"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Плавающий '...' пузырек"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr "Производительность"
 
@@ -554,13 +554,13 @@ msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Помощь"
@@ -573,11 +573,11 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Закрыть"
 
@@ -597,17 +597,17 @@ msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -622,83 +622,83 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Некорректный сервер обновленмй: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
@@ -900,25 +900,25 @@ msgstr "%d секунд"
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -943,65 +943,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файлстрокацвета файлназначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Ошибка сети"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "По умолчанию"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "черный"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "красный"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "зеленый"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "синий"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "золотой"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "желтый"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "розовый"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "фиолетовый"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "серый"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "коричневый"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "радуга 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "радуга 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "радуга 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Общая Магия"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Магия Жизни"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Боевая Магия"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Магия Трансформации"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Магия Природы"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Астральная магия"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Нейтральное"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Друг"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Пренебрегаемый"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Игнорировано"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Стерт"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "В черном списке"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Враг"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "не сорт."
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "по цене"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "по названию"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "по ID"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "по весу"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "по кол-ву."
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "по типу"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Без цели"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Разрешить цель"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Необходима цель"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Нормально"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Авт. закрыть"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Пропустить"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Группа: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Гильдия: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PvP ранг: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
@@ -1009,7 +1230,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Торговать"
@@ -1023,49 +1244,49 @@ msgstr "Торговать"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Уничтожить"
 
@@ -1083,9 +1304,9 @@ msgstr "Уничтожить"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Движение"
@@ -1094,7 +1315,7 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Разговор"
@@ -1105,9 +1326,9 @@ msgstr "Разговор"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Купить"
 
@@ -1118,9 +1339,9 @@ msgstr "Купить"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Продать"
 
@@ -1128,26 +1349,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "Добавить коментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -1155,7 +1376,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1163,7 +1384,7 @@ msgstr "Добавить в список игнорирования"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
@@ -1186,69 +1407,69 @@ msgstr "Добавить имя в чат"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Отмена"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Элемент карты"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -1258,20 +1479,20 @@ msgstr "Переименовать"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -1280,77 +1501,77 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1360,68 +1581,68 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Имя:                    "
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -1430,64 +1651,64 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -1495,57 +1716,56 @@ msgstr "Получить все"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(по умолчанию)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -1553,134 +1773,134 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr "Поставить защиту"
 
@@ -1688,9 +1908,9 @@ msgstr "Поставить защиту"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Снять"
 
@@ -1698,22 +1918,22 @@ msgstr "Снять"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -1721,56 +1941,56 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Разделить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Кикнуть"
 
@@ -1885,10 +2105,10 @@ msgstr "Выбор OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Выход"
 
@@ -2450,12 +2670,12 @@ msgstr "Страница вниз"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Другое"
 
@@ -2475,11 +2695,10 @@ msgstr "Выбор2"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Удалить"
 
@@ -2515,23 +2734,23 @@ msgstr "Основное"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Окна"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Смайлы"
 
@@ -2539,7 +2758,7 @@ msgstr "Смайлы"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Чат"
 
@@ -2595,7 +2814,7 @@ msgstr "Боты"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Монстры"
 
@@ -2621,7 +2840,7 @@ msgstr "Члены гильдии"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
@@ -2755,99 +2974,39 @@ msgstr "Точка дороги"
 msgid "Tiles border"
 msgstr "Бордюр тайлов"
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Уровень: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "черный"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "красный"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "зеленый"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "синий"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "золотой"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "желтый"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "розовый"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "фиолетовый"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "серый"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "коричневый"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Од."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Изменить"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -2858,30 +3017,30 @@ msgid "Battle"
 msgstr "Битва"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Глобальное объявление:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальное объявление от %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s вошел(а)."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вышел(а)."
@@ -2895,157 +3054,153 @@ msgstr "ГМ"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Гильдия"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Язык"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(без звука)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Аудио"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Основные настройки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Включить Аудио"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Включить музыку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Включить игровые эффекты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Включить эффекты интерфейса"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Громкость музыки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Включить плавный переход музыки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Частота аудио"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "моно"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "стерео"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "окружение"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "окружение+центр+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Аудио каналы"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Звуковые эффекты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Звук информационного диалога"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Звук вопроса"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Звук криватного сообщения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Звук сообщения в гильдии или группе"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Звук подсветки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Звук глобального сообщения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Звук ошибки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Звук обмена"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Звук открытия окна"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Звук закрытия окна"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Включить голосовой чат mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Скачать музыку"
 
@@ -3068,8 +3223,8 @@ msgstr "Защитить фокус чата"
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Цвета"
 
@@ -3238,100 +3393,100 @@ msgstr "Показывать кнопку эмоций в чате"
 msgid "Show motd server message on start"
 msgstr "Показывать motd сообщение сервера"
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Введите: "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Задержка:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Красный:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Зеленый:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Синий:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Статичный"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Пульсирующий"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Радуга"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Спектр"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Назначить"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Снять назначение"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "По умолчанию"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Сбросить все кнопки"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Ввод"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3342,50 +3497,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "неизвестно"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Калибровать"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Определение джойстика"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Использовать джойстик если игра свернута"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Джойстик"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Стоп"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Вращайте стик и не нажимайте другие кнопки"
 
@@ -3400,279 +3555,269 @@ msgid "No mods present"
 msgstr "Для данного сервера моды не существуют"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Всегда показывать"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Скрывать с небольшим разрешением"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Всегда скрывать"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "Системный прокси"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Прямое соединение"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 хост"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "По умолчанию"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "низ."
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "средне"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "ТВ"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "выс."
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "большой2"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "большой3"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Разное"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр., нанесенные монстрам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Карта"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Рисовать путь"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Рисовать клавиши на карте"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Включить ленивую прокрутку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "ленивая прокрутка"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "радиус прокрутки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Автоматически менять размер миникарты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr "Играть анимацию карт"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Движения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Атаковать следующую цель"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Синх. движение"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Относительное движение мышью (подходит для тач интерфейсов)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Включить фильтр поднятия"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr "Включить поддержку животных"
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Включить напоминание о весе"
 
@@ -3680,285 +3825,285 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Магазин"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Прокручивать прицел по НИП"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст НИП"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Поддержка ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Включить поддержку бота AuctionBot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Задержка перед повтором"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Интервал повторения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Специальное время повтора клавиш"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Кнопки"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Прокси сервер"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Тип прокси"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Прокси адрес:порт"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr "Включить поддержку двойного клика"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Включить лог OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Включить лог ввода"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку щита"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr "Путь для снимков экрана"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Задержка между сетевыми соединениями"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Показать фон"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Переопределение плотности экрана"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Нет"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr "Улучшение производительности (включите для большей производительности)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr "Автоматически подстраивать производительность"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Аппаратное ускорение"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 "Включить кеш прозрачности (программный режим, может использовать много "
 "памяти)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Включить оптимизацию карты (программно)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Включить задержку в компонентном спрайте (Программно)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Разрешить паузу при загрузке изображений (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Включить \"образец\" текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr "Улучшение качества (выключите для лучшей производительности)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 "Включить исправление альфа канала (программный режим, может быть очень "
 "медленным)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Отображать прозрачность на персонажах и монстрах"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Включить перестановку спрайтов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 "Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Выключить расширенное кеширование сущностей (программный режим)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Выключить кеширование сущностей (программный режим)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 "Разные настройки (включение или выключение может улучшить производительность)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr "Включить компрессию текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Включить расширение - прямоугольные текстуры (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Использовать новый формат текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Включить атласы текстур (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr "Кэшировать все спрайты на карте (может быть использовано много памяти)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr "Кешировать все звуки (может использовать дополнительную память)"
 
@@ -4039,401 +4184,360 @@ msgstr "Использовать специальную диагональную
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Имя"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Отношение"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Нейтральное"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Друг"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Пренебрегаемый"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Игнорировано"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Стерт"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "В черном списке"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Враг"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Связи"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Очень маленький (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Очень маленький (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Нормальный (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Большой (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Большой (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Большой (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Большой (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Большой (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Большой (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Очень большой (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Очень большой (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Очень большой (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Китайский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Чешский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Английский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Финский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Французский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Немецкий"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Индонезийский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Итальянский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Польский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Японский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Голландский (Бельгийский/Фламандский)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Португальский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Португальский (Бразильский)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Русский"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Испанский (Кастильский)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Турецкий"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Основной шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Язык"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Шрифт помощи"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr "Шрифт НИП"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Японский шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr "Китайский шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Размер шрифта"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "Размер шрифта НИП (NPC)"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Название:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Авторские права:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Информация о теме"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Перезагрузите игру дабы изменения вступили в силу."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Маленький"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Нормально"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Средний"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Большой"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Касания"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Экранная клавиатура"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Показывать значок экранной клавиатуры"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Действие значка клавиатуры"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Экранный джойстик"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Показывать экранный джойстик"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Размер джойстика"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Экранные кнопки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Показывать экранные кнопки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Формат кнопок"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Размер кнпок"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Действие кнопки %u"
@@ -4549,323 +4653,314 @@ msgstr ""
 "разрешении"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Нет текста"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Текст"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Пузырьки, без названий"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Пузырьки с названиями"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "выкл"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "качество"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "нормально"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr "производительность"
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "вкл."
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Графика"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr "Увеличение"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Информационные сообщения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Показывать в чате сообщения о поднятых предметах"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Показывать сообщения о поднятых предметах в виде эффектов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Эффекты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Захватывать ввод с клавиатуры и мыши"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Смазывать текстуры (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Непрозрачность интерфейса"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Текст над головами"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "макс."
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Физика частиц"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Гамма"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Включить гамма коррекцию"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Вертикальная синхронизация"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Центрировать игровое окно"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Разрешить запуск скринсейвера"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "КО"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Кто онлайн"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "СПР"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "КВ"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Квесты"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "ДБ"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Окно детектора ботов"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "СА"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Статистика убийств"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Смайлы"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "СО"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Состояние"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "СН"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Снаряжение"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "ИНВ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Инвентарь"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "КАР"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "УМ"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Умения"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "СПЕ"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Особые"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "ОБЩ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Общество"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "ГК"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "ЗАК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "БР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "ВЗ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Знаете ли вы"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "МАГ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "НАР"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "ОТЛ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "ОКН"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "ОПЦ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
@@ -4877,7 +4972,7 @@ msgstr "Окно детектора ботов"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -4886,61 +4981,21 @@ msgstr "Сбросить"
 msgid "Result"
 msgstr "Результат"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "не сорт."
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "по цене"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "по названию"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "по ID"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "по весу"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "по кол-ву."
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "по типу"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr "Создание предметов"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Количество:"
 
@@ -4950,9 +5005,9 @@ msgstr "Количество:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4962,18 +5017,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Создать"
 
@@ -4982,7 +5037,7 @@ msgstr "Создать"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5030,7 +5085,7 @@ msgstr "Адрес E-mail не совпадает"
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Изменить пароль"
 
@@ -5039,7 +5094,7 @@ msgstr "Изменить пароль"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Пароль:"
@@ -5072,7 +5127,7 @@ msgid "The new password entries mismatch."
 msgstr "Новый пароль не совпадает."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Новый персонаж"
 
@@ -5080,9 +5135,9 @@ msgstr "Новый персонаж"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Имя:"
 
@@ -5090,11 +5145,11 @@ msgstr "Имя:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5103,134 +5158,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Стрижка:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Мужчина"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Женщина"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr "Внешность:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Подтвердите удаление героя"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Аккаунт %s (последний вход %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Сменить героя"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Играть"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Сведения"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5245,48 +5300,33 @@ msgstr ""
 "Опыт: %u\n"
 "Деньги: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "радуга 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "радуга 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "радуга 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr "животное %s'а"
@@ -5307,201 +5347,201 @@ msgid "Net"
 msgstr "Сеть"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Музыка:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Карта:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Миникарта:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "Курсор:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr "Количество эффектов:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Кол-во. объектов:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Позиция игрока:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr "Вызовов рис.:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr "Биндингов текстур:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr "%d Лог./сек."
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Программно)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (нормальный OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (безопасный OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (мобильный OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 поумолчанию)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr "Количество текстур:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Количество частиц: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Цель:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Id цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr "Тип цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr "Уровень цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr "Раса цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Группа цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr "Гильдия цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "Задержка атаки:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr "Минимальный удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr "Максимальный удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr "Критический удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Уровень цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Группа цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Гильдия цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Пинг: %s мс."
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Вх.: %d байт/сек."
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
@@ -5532,61 +5572,61 @@ msgstr "Автоматически открывать это окно"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "ОК"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Редактирование сервера"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Соединиться"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Адрес:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Порт:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Тип сервера:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Описание:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "URL онлайн списка:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотя бы адрес и порт сервера"
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr "Нормальный шрифт"
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr "Шрифты"
 
@@ -5596,47 +5636,47 @@ msgid "Did you know..."
 msgstr "Знаете ли вы..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Всё"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -5749,62 +5789,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "jacko появляется"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Авт. закрыть"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Пропустить"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Вход"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Запомнить логин"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Обновления:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Сменить сервер"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Регистрация"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Польз. сайт обновлений"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Сервер:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Сервер обновлений: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Открыть ссылку регистрации"
 
@@ -5881,17 +5911,17 @@ msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Применить"
 
@@ -5900,9 +5930,9 @@ msgstr "Применить"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Добавить"
 
@@ -5922,7 +5952,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Наряд: %d"
@@ -5938,40 +5968,40 @@ msgid "Away outfit"
 msgstr "наряд отсутствия"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Сменить сервер"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Имя пользователя должно содержать не менее %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Имя пользователя должно содержать менее %u символов."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5979,128 +6009,128 @@ msgstr "Пароль должен содержать не менее %u симв
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Пароль должен содержать не более %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "продажа предмета"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Вы действительно хотите продать %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Загрузить"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Применить"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Купить"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Продать"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Анонс"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Аукцион"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
@@ -6129,277 +6159,277 @@ msgid "Skill %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Выход из гильдии %s запрошен."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Приглашение игрока в Гильдию"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого вы хотите пригласить в гильдию %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Покинуть Гильдию?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Членов: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Игроков: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Группа"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr "Видимых игроков: %d"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Нав"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Порталов: %u/%u"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Атк"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Подб"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Подбирать предметы"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Игнорировать предметы"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Друзей: %u/%u"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Создать группу"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не первое."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Имя группы"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -6441,149 +6471,104 @@ msgstr "Очки персонажа: %d"
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Без цели"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Разрешить цель"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Необходима цель"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Общая Магия"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Магия Жизни"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Боевая Магия"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Магия Трансформации"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Магия Природы"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Астральная магия"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Редактор команд"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "Магия"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "Другое"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Символ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Команда:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Комментарий:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Тип цели:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Картинка:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Мана:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Уровень школы:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Сохранить"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Подтвердить торговлю"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Торговля: Вы"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Сменить"
 
@@ -6593,12 +6578,12 @@ msgid "You give:"
 msgstr "Вы отдаете:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -6611,36 +6596,36 @@ msgid "Name: %s"
 msgstr "Имя: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Обновление..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr "Показать все новости (может быть медленным)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Завершено"
 
@@ -6670,42 +6655,42 @@ msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Выбрать Сервер"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Сменить логин"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -6713,7 +6698,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "неиз."
 
@@ -6850,165 +6835,165 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Сила (str):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Удача (luk):"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера персонажей."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Некорректные статы."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Некорректный тип волос."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Неправильная раса."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr "Неправильная внешность."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Персонаж удален"
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Сообщение не может быть отправлено, %s оффлайн."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Игра"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Запрос на выход отклонен!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Имя гильдии: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Мастер гильдии: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Уровень гильдии: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Пользователей онлайн: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Макс. членов: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Средний уровень: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Опыт гильдии: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Нужно опыта до следующего уровня: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Замки: %s"
@@ -7060,58 +7045,58 @@ msgid "Experience sharing unknown."
 msgstr "Политика распределения опыта неизвестна."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Учетная запись не найдена. Попробуйте снова."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Старый пароль указан неверно."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Неверный пароль"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Клиент устарел"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7120,22 +7105,22 @@ msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Сервер переполнен"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Неправильный email."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Пользователь удален"
 
@@ -7155,13 +7140,13 @@ msgid "Connection to server terminated. "
 msgstr "Подключение к серверу прервано."
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Сообщение"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7169,279 +7154,279 @@ msgstr ""
 "восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
 "восстанавливаться."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Не удалось начать торговлю!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Не удалось использовать смайлик!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Не удалось присесть!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Не удалось создать чат!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Нельзя присоединиться к группе!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Нельзя кричать!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно больше денег... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Изменение не удалось..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Не удалось ничего украсть..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr "Сила (str) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr "Выносливость (agi) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr "Живучесть (vit) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr "Интеллект (int) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr "Ловкость (dex) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr "Удача (luk) %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Сила (str)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Удача (luk)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Зона атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Торговля: Вы и %s"
@@ -7811,7 +7796,7 @@ msgstr "Безопасный OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"
 
diff --git a/po/sk.po b/po/sk.po
index a20b18b2c..d49bc884d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -498,42 +498,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Nastavenie"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -545,13 +545,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Nápoveda"
@@ -564,11 +564,11 @@ msgstr "Nápoveda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -588,17 +588,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -613,83 +613,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Neznámy príkaz."
 
@@ -889,25 +889,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -930,65 +930,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -996,7 +1217,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1010,49 +1231,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1070,9 +1291,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1081,7 +1302,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1092,9 +1313,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Kúpiť"
 
@@ -1105,9 +1326,9 @@ msgstr "Kúpiť"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Predaj"
 
@@ -1115,26 +1336,26 @@ msgstr "Predaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1142,7 +1363,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1150,7 +1371,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1173,69 +1394,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1245,20 +1466,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1267,77 +1488,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1347,68 +1568,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1417,64 +1638,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1482,57 +1703,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Použiť"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1540,134 +1760,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1675,9 +1895,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Odstrojiť"
 
@@ -1685,22 +1905,22 @@ msgstr "Odstrojiť"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Vystrojiť"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1708,56 +1928,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Zahodiť"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1872,10 +2092,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -2437,12 +2657,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2462,11 +2682,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Vymazať"
 
@@ -2502,23 +2721,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2526,7 +2745,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2582,7 +2801,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2608,7 +2827,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2742,99 +2961,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2845,30 +3004,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globálne oznámenie:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globálne oznámenie od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2882,157 +3041,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Sfx zvuk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Hudobný zvuk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3055,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3225,100 +3380,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3327,50 +3482,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3385,279 +3540,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3665,279 +3810,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Obchod"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4018,401 +4163,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4522,323 +4626,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Stav"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Vybavenie"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventár"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Schopnosti"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4850,7 +4945,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4859,61 +4954,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4923,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4935,18 +4990,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -4955,7 +5010,7 @@ msgstr "Vytvoriť"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5003,7 +5058,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
@@ -5012,7 +5067,7 @@ msgstr "Zmeniť heslo"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Heslo:"
@@ -5045,7 +5100,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5053,9 +5108,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Meno"
 
@@ -5063,11 +5118,11 @@ msgstr "Meno"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5076,134 +5131,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Muž"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Žena"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prosím rozdeľ %d bodov"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tvoje meno musí mať aspoň 4 písmená."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Charakterové staty OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prosím odstráň %d bodov"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potvrďte zmazanie postavy"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5213,48 +5268,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,12 +5305,12 @@ msgid "Yes"
 msgstr "Áno"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5500,61 +5540,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Potvrdiť"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5564,47 +5604,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Zvoľte množstvo vecí k rozdeleniu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5717,62 +5757,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Prihlásenie"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrovať"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5849,17 +5879,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Nasledujúci"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5868,9 +5898,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5890,7 +5920,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5906,40 +5936,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Zmeniť server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Vymeniť postavu"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5947,128 +5977,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Použiť"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6097,277 +6127,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6409,149 +6439,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6561,12 +6546,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6578,36 +6563,36 @@ msgid "Name: %s"
 msgstr "Meno: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6637,42 +6622,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6680,7 +6665,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6815,163 +6800,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7023,58 +7008,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7082,22 +7067,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7117,290 +7102,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7770,7 +7755,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 2d2a4b502..2faa8eaf0 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -563,11 +563,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Unknown command > Komand e panjohur"
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1091,9 +1312,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1104,9 +1325,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1114,26 +1335,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr ""
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr ""
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2581,7 +2800,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4858,61 +4953,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr ""
 
@@ -4954,7 +5009,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5011,7 +5066,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr ""
 
@@ -5062,11 +5117,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5865,9 +5895,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 5346aba1e..f245d181e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/manaplus/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Hjälp"
@@ -563,11 +563,11 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Stäng"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Fel"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Allmänt"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Nätverksfel"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Vän"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Förbisedd"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorerad"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Byteshandla"
@@ -1009,49 +1230,49 @@ msgstr "Byteshandla"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Prata"
@@ -1091,9 +1312,9 @@ msgstr "Prata"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Köp"
 
@@ -1104,9 +1325,9 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1114,26 +1335,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Hämta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -1684,22 +1904,22 @@ msgstr "Avrusta"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Utrusta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Släpp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr "Välj okej"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chatt"
 
@@ -2581,7 +2800,7 @@ msgstr "NPC:er"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monster"
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Pengar: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Globalt meddelande:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globalt meddelande från %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Gille"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Musikvolym"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Färger"
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statisk"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulserande"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Tilldela"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Förval"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibrera"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stopp"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "låg"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "medium"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "hög"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Karta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Affär"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Namn"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relation"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Vän"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Förbisedd"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorerad"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Typsnittsgrad"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Ingen text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Textbubblor utan namn"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Textbubblor med namn"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "av"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Text ovanför huvudet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "maximal"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Utrustning"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventarium"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Färdigheter"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Återställ"
 
@@ -4858,61 +4953,21 @@ msgstr "Återställ"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Skapa"
 
@@ -4954,7 +5009,7 @@ msgstr "Skapa"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
@@ -5011,7 +5066,7 @@ msgstr "Ändra lösenord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Lösenord:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Namn:"
 
@@ -5062,11 +5117,11 @@ msgstr "Namn:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Man"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Kvinna"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Karaktärens värden okej"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Spela"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Information"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Avregistrera"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "Okej"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal att hämta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Användarnamn"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Vidare"
 
@@ -5865,9 +5895,9 @@ msgstr "Vidare"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Lägg till"
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är ogiltigt."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Byt server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Byt karaktär"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Verkställ"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grupp"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Föreslå handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Bekräftat. Väntar…"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Godkänn handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Godkänt. Väntar…"
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Ändra"
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 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."
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "Namn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Styrka"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Smidighet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Hälsa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligens"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Skicklighet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Tur"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill byteshandla med dig, accepterar du?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "namnlös"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index c4c351a48..63ad53095 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr "Människa"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du blev dödad av herr %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] "Du plockade upp %d [@@%d|%s@@]."
 msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr "xp"
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr "(D) standardrörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr "(I) invertera rörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr "(c) rör sig med några crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr "(C) rör sig med crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normal + crazy"
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr "(?) okänt move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) crazy move nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr "(a) standard crazy move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr "(?) crazy move"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr "(0) standardrörelse mot target"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr "(1) närmar sig target med distans 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr "(2) närmar sig target med distance 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr " (3) närmar sig target med distans 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr " (5) närmar sig target med distans 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr " (7) närmar sig target med distans 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr " (A) närmar sig target till attack range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr "(a) archer attack-range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) flyttar till target för attack-range - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?) förflyttar sig till target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr "(D) standard follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr "(R) relativ follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr "(M) härma follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr "(P) pet follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr "(?) okänd follow"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) attack"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr "(D) standardattack"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr "(s) växla attack utan shield"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr "(S) växla attack med shield"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) gå och attackera"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) gå, attackera, pickup"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr "(d) utan automatisk attack"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) liten pick up 1x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standard pick up 2x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) framåt pick up 2x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) pick up 3x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) gå och pick up med distans 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) gå och pick up med distans 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr "(A) gå och pick up med maximal distans"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?) pick up"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr "(N) normal kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr "(D) debug kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr "(u) ultra-kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-kartvy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr "(e) tom kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr "(b) svartvit kartvy"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr "(f) använd #flar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) använd #chiza för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) använd #ingrav för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) använd #frillyar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) använd #upmarmu för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr "(?) magic attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) attackera alla spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr "(f) attackera alla utom dina friends"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr "(b) attackera dåliga relationer"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr "(d) attackera inte spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr "(?) pvp-attack"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) Standardimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) klädselimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Iväg"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr "(O) på tangentbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr "(A) away"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr "(G) spelkamera-läge"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr "Game modifiers är aktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr "Game modifiers är inaktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr "Game modifiers är okända"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -497,42 +497,42 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr "Print '...'"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr "Blink-namn"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr "Floating '...' bubble"
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "Floating bubble"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Hjälp"
@@ -563,11 +563,11 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Stäng"
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -612,83 +612,83 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Felaktig uppdaterings-host: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Ogiltigt kommando."
 
@@ -888,25 +888,25 @@ msgstr "%d sekunder"
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Nätverksfel"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "standard"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "svart"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "röd"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "grön"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "blå"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "guld"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "gul"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "rosa"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "lila"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "grå"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "brun"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "regnbåge 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "regnbåge 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "regnbåge 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "General Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Life Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "War Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Transmute Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Nature Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astral Magic"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Neutral"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Vän"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "Ignorerad"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Ignorerad"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Borttagen"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr "Blacklistad"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr "Enemy"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "osorterad"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "efter pris"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "efter namn"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "efter id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "efter vikt"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "efter antal"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "efter typ"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Ingen Target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Tillåt Target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Behöver Target"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Automatisk stängning"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Skippa"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Party: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guild: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Pvp-rank: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
@@ -995,7 +1216,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Trade"
@@ -1009,49 +1230,49 @@ msgstr "Trade"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1069,9 +1290,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Flytta"
@@ -1080,7 +1301,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Prata med"
@@ -1091,9 +1312,9 @@ msgstr "Prata med"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Köp"
 
@@ -1104,9 +1325,9 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1114,26 +1335,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1141,7 +1362,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1149,7 +1370,7 @@ msgstr "Lägg till i ignoreringslistan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
@@ -1172,69 +1393,69 @@ msgstr "Lägg till namnet i chat"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Kartobjekt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1244,20 +1465,20 @@ msgstr "Ändra namn"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -1266,77 +1487,77 @@ msgstr "Rör kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Lämna"
 
@@ -1346,68 +1567,68 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "Namn:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1416,64 +1637,64 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -1481,57 +1702,56 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(standard)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -1539,134 +1759,134 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr "Skydda item"
 
@@ -1674,9 +1894,9 @@ msgstr "Skydda item"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -1684,22 +1904,22 @@ msgstr "Unequip"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -1707,56 +1927,56 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr "Sparka"
 
@@ -1871,10 +2091,10 @@ msgstr "Välj OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "Annat"
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Radera"
 
@@ -2501,23 +2720,23 @@ msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Genvägar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr "Fönster"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr "Emotes"
 
@@ -2525,7 +2744,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Chat"
 
@@ -2581,7 +2800,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Monster"
 
@@ -2607,7 +2826,7 @@ msgstr "Guild-medlemmar"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Partickeleffekter"
 
@@ -2741,99 +2960,39 @@ msgstr "Väg-märke"
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr "svart"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr "röd"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr "grön"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr "blå"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr "guld"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr "gul"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr "rosa"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr "lila"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr "grå"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr "brun"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr "Öppna url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Ändra"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr "Battle"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Global announcement:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -2881,157 +3040,153 @@ msgstr "GM"
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr "Lang"
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr "(ljudlöst)"
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr "Enkla inställningar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Aktivera Ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Aktivera musik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Aktivera spel-sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Aktivera grafiskt användargränssnitts-sfx"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "Sfx volym"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Musik-volym"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr "Aktivera fade-ut för musik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr "Ljudfrekvens"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr "mono"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr "stereo"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr "surround"
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr "surround+center+lfe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr "Ljudkanaler"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr "Ljudeffekter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr "Informationsdialog-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr "Förfrågningsdialogs-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr "Viskningsmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Guild / Party-meddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr "Highlight-meddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr "Globalmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr "Felmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Trade-förfrågnings-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr "Ljud för visa fönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr "Ljud för dölj fönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "Aktivera mumble röst chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Ladda hem musik"
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Färger"
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Så här ser färgerna ut"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Fördröjning:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Röd:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Grön:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Blå:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Statiskt"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Tilldela"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Default"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr "Putta in"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Tangent-konflikt(er) uppmärksammade."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan sp
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr "okänd"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Tryck på knappen för att starta kalibreringen"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibrera"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr "Upptäck joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr "Använd glödjesticka om klientfönstret är inaktivt"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Stopp"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr "Rotera stickan men rör inga knappar"
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr "Visa alltid"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr "Dölj automatiskt vid låg upplösning"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr "Dölj alltid automagiskt"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr "System-proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr "Direkt-anslutning"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostnamn"
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "standard"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "låg"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "medium"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "hög"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Misc"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Visa skada gjord mot monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Bara nåbara monster för automatiskt target"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Highlight monsters attack-räckvidd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Visa monster hp-bar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Cycle monsters targets"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Karta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Visa warps-partiklar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "Highlight kartporträtt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Highlight golvobjekt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Highlight spelarens attack-räckvidd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr "Visa förstorad minikarta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Rita ut väg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Rita ut hotkeys på kartan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr "Aktivera lat-skrollning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr "Skroll-lathet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr "Skroll-radius"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr "Auto-ändra storlek för minikartan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "Förflyttning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Auto-fix position"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Attackera under rörelse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr "Attackera nästa target"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Synkronicera spelarrörelse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Crazy move A FuXual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Musrelativa förflyttningar (bra för touch-gränssnitt)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "Spelare"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Visa egen hp-bar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Aktivera quick stats"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Cycle spelarens targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "Visa jobbexp-meddelanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Visa spelar-popups"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr "Afk-meddelande"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "Visa jobb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "Aktivera attack-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Aktivera pickup-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr "Aktivera annonsprotokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Aktivera vikt-notationer"
 
@@ -3664,279 +3809,279 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Shop"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Acceptera sälj/köp erbjudanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr "Cycle npc-targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "Logga NPC-dialoger"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "Bots support"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr "Aktivera support för auktions-bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr "Tangentbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr "Upprepningsfördröjning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr "Upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr "Anpassat upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr "Genvägsknappar"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr "Proxy-server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr "Proxy-typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr "Proxy-adress:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Aktivera serversideattack"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr "Aktivera dubbleklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Aktivera bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Aktivera debug-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr "Aktivera OpenGL-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr "Aktivera inputs-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Lågtrafik-mode"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Dölj sköld"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Använd FBO för skärmdumpar (bara för openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr "Nätverksfördröjning mellan underservrar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Visa bakgrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr "Skärmdensitet överskrids"
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Nej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Hw acceleration"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr "Aktivera minskad karta (programvara)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr "Aktivera förenad sprites-fördröjning (Programvara)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr "Aktivera fördröjd bildinladdning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr "Aktivera texturprov (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Aktivera alphakanal-fix (Programvaran kan bli väldigt långsam)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr "Visa genomskinliga varelser "
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr "Aktivera återordna sprites."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Litet minne (aktivera för lägre minnes-användning)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr "Avaktivera avancerad varelse-cachning (Programvaran)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr "Avaktivera varelse-cachning (Programvara)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr "Aktivera rektangulär texturförlängning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr "Använd nya interna texturformat (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr "Aktivera texturmappning (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr "Cache:a alla sprites per karta (kan få för sig att använda mer minne)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "Namn"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "Relation"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Neutral"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Vän"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "Ignorerad"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Ignorerad"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Borttagen"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr "Blacklistad"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr "Enemy"
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "Relationer"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr "Väldigt liten (8)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr "Väldigt liten (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Pytte (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Liten (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Medium (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr "Stor (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr "Rätt stor (15)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr "Rätt stor (16)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr "Stor (17)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr "Stor (18)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr "Stor (19)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr "Väldigt stor (20)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr "Väldigt stor (21)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr "Väldigt stor (22)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr "Kinesiska (Du vet Kina)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr "Tjeckiska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr "Engelska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr "Finska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr "Franska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr "Tyska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr "Indonesiska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr "Italienska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr "Polska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr "Japanska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Nederländska (Belgien / Flandern)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr "Portugisiska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr "Portugisiska (brasilianska)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr "Ryska"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr "Spanska (Castilian)"
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr "Turkiska"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Gui-tema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Main Font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr "Språk"
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Bold font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Partikel-font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Hjälp-font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "Säkra font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "Japansk font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Font-storlek"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr "NPC font-storlek"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr "Namn:"
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr "Copyright:"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr "Temainformation"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema ändrat"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr "Liten"
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr "Medium"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr "Stor"
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr "Touch"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr "Onscreen-tangentbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr "Visa ikon för onscreen-tangentbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr "Händelse för Tangentbordsikon"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr "Onscreen-joystick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr "Visa onscreen-joystick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr "Joystickens storlek"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr "Onscreen-knappar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr "Visa onscreen-knappar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr "Knappformat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr "Knappens storlek"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr "Knapp %u händelse"
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Ingen text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Text"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Bubblor, utan namn"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "Bubblor, med namn"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "av"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr "Bästa kvalitet"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr "normal"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr "på"
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr "Visuellt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Notifikationer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Visa pickup-notationer i chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Visa pickup-notationer som coola partickeleffekter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr "Effekter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr "Fånga mus och tangentbords-input"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr "Dimmiga texturer (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gui-opacitet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Rubriktext"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "max"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Partikel-detalj"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr "Partikelfysik"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr "Gamma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr "Aktivera gamma-kontroll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr "Vsync"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr "Centrera spelfönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr "Tillåt skärmsläckare att starta"
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Vem är online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr "QE"
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr "Uppdrag"
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Bot checker"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Skills"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Specials"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
@@ -4849,7 +4944,7 @@ msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Återställ"
 
@@ -4858,61 +4953,21 @@ msgstr "Återställ"
 msgid "Result"
 msgstr "Resultat"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr "osorterad"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr "efter pris"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr "efter namn"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr "efter id"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr "efter vikt"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr "efter antal"
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr "efter typ"
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr "Antal:"
 
@@ -4922,9 +4977,9 @@ msgstr "Antal:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4934,18 +4989,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Skapa"
 
@@ -4954,7 +5009,7 @@ msgstr "Skapa"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr "E-postadressen matchar inte."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Ändra Lösenord"
 
@@ -5011,7 +5066,7 @@ msgstr "Ändra Lösenord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Lösenord:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr "Det nya lösenordet matchar inte."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr "Ny karaktär"
 
@@ -5052,9 +5107,9 @@ msgstr "Ny karaktär"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "Namn:"
 
@@ -5062,11 +5117,11 @@ msgstr "Namn:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5075,134 +5130,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Man"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Kvinna"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Verkställ borttagning av karaktär"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill radera denna karaktär?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Konto %s (senaste inloggning var %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Ändra inloggad"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Spela"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Avregistrera"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "Ändra lösenord"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "regnbåge 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "regnbåge 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "regnbåge 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentera: %s; %d spelare är presenterad."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr "Target"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr "Nät"
 
@@ -5499,61 +5539,61 @@ msgstr "Öppna automatiskt detta fönster"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Anslut"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr "Adress:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Server-typ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr "Notering:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr "Online-lista url:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr "Normal font"
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr "Fonter"
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr "Viste du att..."
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -5714,62 +5754,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr "jacko spawnar"
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Automatisk stängning"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Skippa"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Kom ihåg användarnamn"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Uppdatera:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Ändra Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Anpassad uppdatering-host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr "Uppdatera host: %s"
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr "Öppna register-url"
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Submit"
 
@@ -5865,9 +5895,9 @@ msgstr "Submit"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Lägg till"
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Misslyckades att sända som avsändare eller felaktig bokstav."
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Klädsel: %d"
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr "Borta-klädsel"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Byt server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Byt karaktär"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Godkänn:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Användarnamnet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Användarnamnet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr "Lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Lösenordet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Lösenordet överensstämmer inte."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr "Sälj item"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Vill du verkligen sälja %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Välj server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Ladda"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Använd samma ip för spelunderservrar"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Laddar hem server-lista...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Väntar på server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "Förbereder hemladdning"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Fel uppstod när serverlistan hämtades!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "Nyare version behövs"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "v%s behövs"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Verkställ"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Köp items"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Sälj items"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Annonsera"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Visa länkar i annonseringen"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vill %s %s, accepterar du?"
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Bjud in användare %s till guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s avslutning förfrågad."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Medlem bjuder in till Guild"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Vem vill du bjuda in till guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Lämna Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Är du säker på att du vill lämna guild %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Medlemmar: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Spelare: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Party"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Bjud in spelare %s till party."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Party %s avslutning förfrågad."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Medlem bjuder in till Party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Vem vill du bjuda in till party %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Lämna Party?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Är du säker på att du vill lämna party %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr "Synliga spelare: %d"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portaler: %u/%u"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Prioriterings-mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Attackera mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Ignorera mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Pickupa items"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Ignorera items"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Vänner: %u/%u"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Skapa Party"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Bjud in"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Nekad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Nekad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Skapar guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "Skapar partyt %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Guild-namn"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Välj ditt guild-namn."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Tog emot guild-request, då ett redan existerar."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig att joina guilden %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Acceptera Guild-inbjudningar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Tog emot party-request, även om ett redan existerar."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Du har blivit inbjuden att joina ett party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du har blivit inbjuden att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig att joina deras party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan inte skapa party. Du är redan i ett party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Party-namn"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
@@ -6406,149 +6436,104 @@ msgstr "Karaktär-points: %d"
 msgid "Correction points: %d"
 msgstr "Correction points: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Ingen Target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Tillåt Target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Behöver Target"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "General Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Life Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "War Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Transmute Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Nature Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Astral Magic"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Kommandotolk"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "magic"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "Annat"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Kommando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Target Typ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "Ikon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Magic level:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Magic School:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "School level:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Spara"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Föreslå trade"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Bekräftat. Väntar..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Gå med på trade"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Överenskommet. Väntar..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Trade: Dig"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "Du får %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Byt"
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "Namn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Uppdateringsprocessen är inte fullständig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Det är starkt rekommenderat att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Välj värld"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Ändra login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Välj värld"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6677,7 +6662,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "-O --no-opengl : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Strength:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agility:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Luck:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Åtkomst nekad. Trolig orsak; det är för många spelare på denna server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Kan inte använda detta ID"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "Fel namn."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "Icke korrekta stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "Icke korrekt hår."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Icke korrekt slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr "Felaktig race."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr "Icke korrekt utseende."
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "Karaktär raderad."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Viskning kunde inte sändas, %s är offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Viskning kunde inte sändas, ignorerad av %s."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "Spel"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr "Efterfrågning att avsluta nekad!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr "Guild-namn: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "Guild master: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "Guild level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "Medlemmar online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "Maximalt antal medlemmar: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "Medel-level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guild exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guild nästa exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Guild slott: %s"
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr "Exp-delning är okänd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Gamla lösenordet är felaktigt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Okänt fel."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr "Anslutningen till servern avslutad."
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Trade misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "Emote misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "Sit misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "Chat-skapning misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Kunde inte joina partyt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "Kan inte skjuta!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "Huh? Vad är det?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "Warp failed..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "Kan inte stjäla något..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "Poison hade ingen effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill trade:a med dig, accepterar du?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Trade: Du och %s"
@@ -7767,7 +7752,7 @@ msgstr "Säker OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
diff --git a/po/te.po b/po/te.po
index ef3838018..83cb4833b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -497,42 +497,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -544,13 +544,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "సహాయం"
@@ -563,11 +563,11 @@ msgstr "సహాయం"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -587,17 +587,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -612,83 +612,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "గుర్తుతెలియని ఆదేశం."
 
@@ -888,25 +888,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -929,65 +929,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "సాధారణ"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -995,7 +1216,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1009,49 +1230,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1069,9 +1290,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1080,7 +1301,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1091,9 +1312,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1104,9 +1325,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1114,26 +1335,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1141,7 +1362,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1149,7 +1370,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1172,69 +1393,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1244,20 +1465,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1266,77 +1487,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1346,68 +1567,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1416,64 +1637,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1481,57 +1702,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1539,134 +1759,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1674,9 +1894,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1684,22 +1904,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1707,56 +1927,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1871,10 +2091,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
@@ -2436,12 +2656,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2461,11 +2681,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -2501,23 +2720,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2525,7 +2744,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2581,7 +2800,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2607,7 +2826,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2741,99 +2960,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2844,30 +3003,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2881,157 +3040,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3054,8 +3209,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "రంగులు"
 
@@ -3224,100 +3379,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "ఇంద్ర ధనస్సు"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3326,50 +3481,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3384,279 +3539,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "పటం"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3664,279 +3809,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "కాదు"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4017,401 +4162,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "పేరు"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4521,323 +4625,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "పాఠ్యం"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "గరిష్ఠ"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4849,7 +4944,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4858,61 +4953,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత్తం: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4922,9 +4977,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4934,18 +4989,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "సృష్టించు"
 
@@ -4954,7 +5009,7 @@ msgstr "సృష్టించు"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5002,7 +5057,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "సంకేతపదాన్ని మార్చు"
 
@@ -5011,7 +5066,7 @@ msgstr "సంకేతపదాన్ని మార్చు"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "సంకేతపదం:"
@@ -5044,7 +5099,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5052,9 +5107,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "పేరు:"
 
@@ -5062,11 +5117,11 @@ msgstr "పేరు:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5075,134 +5130,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "పురుషుడు"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "స్త్రీ"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,48 +5267,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5264,12 +5304,12 @@ msgid "Yes"
 msgstr "అవును"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5499,61 +5539,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "సరే"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5563,47 +5603,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "అన్నీ"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5714,62 +5754,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "ప్రవేశించు"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5846,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "తదుపరి"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5865,9 +5895,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5887,7 +5917,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5903,40 +5933,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "ఈమెయిల్:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5944,128 +5974,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6094,277 +6124,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6406,149 +6436,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6558,12 +6543,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6575,36 +6560,36 @@ msgid "Name: %s"
 msgstr "పేరు: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6634,42 +6619,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6677,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6812,163 +6797,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7020,58 +7005,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7079,22 +7064,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7114,290 +7099,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7767,7 +7752,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 6e3c4bf9a..eab189b06 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -19,474 +19,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -496,42 +496,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "ตั้งค่า"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -543,13 +543,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -562,11 +562,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -586,17 +586,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,83 +611,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "ผิดพลาด"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr ""
 
@@ -887,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -928,65 +928,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -994,7 +1215,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1008,49 +1229,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1068,9 +1289,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1079,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1090,9 +1311,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "ซื้อ"
 
@@ -1103,9 +1324,9 @@ msgstr "ซื้อ"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1113,26 +1334,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1140,7 +1361,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1148,7 +1369,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1171,69 +1392,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "ยกเลิก"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1243,20 +1464,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1265,77 +1486,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1345,68 +1566,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1415,64 +1636,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1480,57 +1701,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "ใช้"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1538,134 +1758,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1673,9 +1893,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1683,22 +1903,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1706,56 +1926,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "ทิ้ง"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1870,10 +2090,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "ออก"
 
@@ -2435,12 +2655,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2460,11 +2680,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
@@ -2500,23 +2719,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2524,7 +2743,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2580,7 +2799,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2606,7 +2825,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2740,99 +2959,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2843,30 +3002,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2880,157 +3039,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3053,8 +3208,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3223,100 +3378,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3325,50 +3480,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3383,279 +3538,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3663,279 +3808,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "ไม่"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4016,401 +4161,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4520,323 +4624,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "สถานะ"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4848,7 +4943,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4857,61 +4952,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4921,9 +4976,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4933,18 +4988,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "สร้าง"
 
@@ -4953,7 +5008,7 @@ msgstr "สร้าง"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5001,7 +5056,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
@@ -5010,7 +5065,7 @@ msgstr "เปลี่ยนรหัสผ่าน"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "รหัสผ่าน:"
@@ -5043,7 +5098,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5051,9 +5106,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "ชื่อ:"
 
@@ -5061,11 +5116,11 @@ msgstr "ชื่อ:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5074,134 +5129,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "ชาย"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "หญิง"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5211,48 +5266,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,12 +5303,12 @@ msgid "Yes"
 msgstr "ใช่"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5498,61 +5538,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5562,47 +5602,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5711,62 +5751,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "เข้าระบบ"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5843,17 +5873,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "ถัดไป"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5862,9 +5892,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5884,7 +5914,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5900,40 +5930,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5941,128 +5971,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6091,277 +6121,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6403,149 +6433,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6555,12 +6540,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6572,36 +6557,36 @@ msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6631,42 +6616,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6674,7 +6659,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6809,163 +6794,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7017,58 +7002,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7076,22 +7061,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7111,290 +7096,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7764,7 +7749,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index f2287c784..ce2cf5551 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -22,87 +22,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "ıskalandı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr "Var olmayan nesne toplanmaya çalışıldı."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "Nesne çok ağır."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "Nesne çok uzakta."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr "Envanter dolu."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr "Nesne başkasına ait."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr "Nesne toplamada bilinmeyen hata oluştu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -110,387 +110,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr "(A) git, saldır, topla"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr "(D) varsayılan taklit"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr "(O) kıyafet taklidi"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr "(?) taklit"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "Uzakta"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -500,42 +500,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -547,13 +547,13 @@ msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Yardım"
@@ -566,11 +566,11 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "Kapat"
 
@@ -590,17 +590,17 @@ msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -615,83 +615,83 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "Hesap kapatma başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "Hata! Güncelleme klasörü oluşturulamadı!"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
@@ -893,25 +893,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -935,65 +935,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "varsayılan"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "siyah"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "kırmızı"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "yeşil"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "mavi"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "altın rengi"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "sarı"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "pembe"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "mor"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "gri"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "kahverengi"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "gökkuşağı 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "gökkuşağı 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "gökkuşağı 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Genel Büyü"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Yaşam Büyüsü"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Savaş Büyüsü"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Dönüşüm Büyüsü"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Doğa Büyüsü"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astral Büyü"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "Nötr"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "Arkadaş"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "İhmal edilmiş"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "Görmezden gelindi"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "Silindi"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Hedef yok"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Hedefe izin ver"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Hedef gerekli"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "Normal"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Otomatik Kapat"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Atla"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grup: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Lonca: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: %s"
@@ -1001,7 +1222,7 @@ msgstr "Ağırlık: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "Takas"
@@ -1015,49 +1236,49 @@ msgstr "Takas"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "Saldırı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1075,9 +1296,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "Taşı"
@@ -1086,7 +1307,7 @@ msgstr "Taşı"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "Konuş"
@@ -1097,9 +1318,9 @@ msgstr "Konuş"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1110,9 +1331,9 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "Sat"
 
@@ -1120,26 +1341,26 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1147,7 +1368,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -1155,7 +1376,7 @@ msgstr "Gözmezden gelinenler listesine ekle"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1178,69 +1399,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "İptal"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "Gruptan at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "Harita nesnesi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1250,20 +1471,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1272,77 +1493,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -1352,68 +1573,68 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "Lonca pozisyonunu değiştir"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "İsim:"
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -1422,64 +1643,64 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "Yarısını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Almak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -1487,57 +1708,56 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1545,134 +1765,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr "Taklit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1680,9 +1900,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "Çıkar"
 
@@ -1690,22 +1910,22 @@ msgstr "Çıkar"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1713,56 +1933,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Bölme"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1877,10 +2097,10 @@ msgstr "Seçim Tamam"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "Çıkış"
 
@@ -2442,12 +2662,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2467,11 +2687,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "Sil"
 
@@ -2507,23 +2726,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2531,7 +2750,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "Sohbet"
 
@@ -2587,7 +2806,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "Canavarlar"
 
@@ -2613,7 +2832,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "Partikül efektleri"
 
@@ -2747,99 +2966,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "Para: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "siyah"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "kırmızı"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "yeşil"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "mavi"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "altın rengi"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "sarı"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "pembe"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "mor"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "gri"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "kahverengi"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "Dünzenle"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -2850,30 +3009,30 @@ msgid "Battle"
 msgstr "Savaş"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "Global duyuru:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s'ten Küresel duyuru:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2887,157 +3046,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "Lonca"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "Ses"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "Sesi etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "Müziği etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "Oyun sfx'ini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "Gui sfx'ini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "SFX ses seviyesi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "Müzik ses seviyesi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr "Lonca / Grup mesaj sesi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr "Takas isteği sesi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "mumble sesli sohbeti etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "Müziği indir"
 
@@ -3060,8 +3215,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "Renkler"
 
@@ -3231,100 +3386,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "Renk bu şekilde görünür"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "Tip:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "Gecikme:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "Kırmızı:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "Yeşil:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "Mavi:"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "Sabit"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Darbe"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "Atamak"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "Sil"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "Varsayılan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "Tuş çatışması tespit edildi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3335,50 +3490,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "Kalibrasyona başlamak için butona tıkla"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "Kalibre et"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "Oyun çubuğunu etkinleştir"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "Oyun çubuğu"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "Dur"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3393,279 +3548,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "varsayılan"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "düşük"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "orta"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "yüksek"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "Çeşitli"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Canavarlara verilen hasarı göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "Sadece erişilebilen canavarları otomatik hedefle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "Canavar saldırı menzilini vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "Canavar HP çubuğunu göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr "Canavar hedeflerini sırayla değiştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "Harita"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr "Geçiş partiküllerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "harita kapılarını vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "Zemin nesnelerini vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "Oyuncu saldırı menzilini vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "Yol çiz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr "Haritada hızlı tuşları çiz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "Otomatik konum sabitleme"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "Hareket halinde saldır"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "Oyuncu hareketlerini eşitle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "Çılgın hareket A programı"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "Kendi HP çubuğunu göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "Hızlı istatistikleri etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr "Oyuncu hedeflerini sırayla değiştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "İş tecrübe mesajlarını göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "Oyuncu açılır pencerelerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "İşi göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr "Toplama filtresini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr "Ağırlık bildirimlerini etkinleştir"
 
@@ -3673,279 +3818,279 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Mağaza"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "Alım/Satım isteklerini kabul et"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "Mağaza modunu etkinleştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "NPC diyaloglarını kaydet"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "Sunucu yan saldırılarını etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "Bot Kontrolörünü etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "Hata ayıklama modunu etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "Düşük trafik modu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr "Kalkan görüntüsünü gizle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "Arkaplanı göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "Hayır"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "Donanım hızlandırma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4026,401 +4171,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "İsim"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "İlişki"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "Nötr"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "Arkadaş"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "İhmal edilmiş"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "Görmezden gelindi"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "Silindi"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "Takasa izin ver"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "Fısıltılara izin ver"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "Görmezden gelirken:"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "Minik (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "Küçük (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "Orta (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "Gui teması"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "Ana Yazı Tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "Kalın Yazı Tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "Partikül yazı tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "Yardım yazı tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "Yazı tipi boyutu"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "Tema Değiştirildi"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "Değişikliklerin etkinleşmesi için istemcinizi tekrar başlatın."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "Normal"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4530,323 +4634,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Bazı pencereler düşürülmüş çözünürlüğe uyması için taşınmış olabilir."
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "Metin yok"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "Metin"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "Balonlar, isimler yok"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "İsimler ve balonlar"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "kapalı"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr "Bildirimleri"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr "Toplama bildirimlerini sohbette göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr "Toplama bildirimlerini partikül efekti olarak göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gui şeffaflığı"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "Başın üstünde yazı"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "Çevresel grafikler"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "en yüksek"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "Partikül detayı"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr "KO"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "Kimler Online"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr "BK"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "Bot kontrolörü"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr "Öİ"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "Öldürme istatistikleri"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr "DRM"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "Durum"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr "EKP"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Ekipman"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr "ENV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Envanter"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "YTN"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "Yetenekler"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr "ÖZL"
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "Özellikler"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr "SOS"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr "Sosyal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr "KY"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr "BY"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "AYR"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "Tuş: %s"
@@ -4858,7 +4953,7 @@ msgstr "Bot Kontrolörü"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -4867,61 +4962,21 @@ msgstr "Sıfırla"
 msgid "Result"
 msgstr "Sonuç"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4931,9 +4986,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4943,18 +4998,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "Oluştur"
 
@@ -4963,7 +5018,7 @@ msgstr "Oluştur"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5011,7 +5066,7 @@ msgstr "E-posta adresleri uyuşmuyor."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "Şifre Değiştir"
 
@@ -5020,7 +5075,7 @@ msgstr "Şifre Değiştir"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "Şifre:"
@@ -5053,7 +5108,7 @@ msgid "The new password entries mismatch."
 msgstr "Yeni şifre girdilerin uyuşmuyor."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5061,9 +5116,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "İsim:"
 
@@ -5071,11 +5126,11 @@ msgstr "İsim:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5084,134 +5139,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "Saç Rengi:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "Erkek"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "Kadın"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Karakter Silmeyi Onayla"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "Bu karakteri silmek istediğinize emin misiniz?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "Hesap Değiştir"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "Oyna"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "Bilgi"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Kaydı Sil"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5221,48 +5276,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "gökkuşağı 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "gökkuşağı 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "gökkuşağı 3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5283,201 +5323,201 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "Müzik:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "Harita:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "Harita:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "İşaretçi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "Haritadaki oyuncu sayısı:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "Oyuncu Konumu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Yazılım)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobil OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikül sayısı: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "Hedef:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "Hedef Adı:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr "Hedef grup:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "Hedef Seviyesi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "Hedef Grup:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "Lonca Hedefle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Gelen: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Giden: %d bytes/s"
@@ -5508,61 +5548,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "TAMAM"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "Bağlan"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "Sunucu Türü:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5572,47 +5612,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "Hepsi"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "Takas yapılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "Bırakılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "Saklanacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "Depodan alınacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "Bölünecek nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "Satın alma mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "Satış mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
@@ -5723,62 +5763,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "Otomatik Kapat"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "Atla"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "Oturum Aç"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "Kullanıcı adını hatırla"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "Güncelle:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "Sunucu Değiştir"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "Kayıt ol"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "Elle güncelleme sunucusu"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "Sunucu:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5855,17 +5885,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Onayla"
 
@@ -5874,9 +5904,9 @@ msgstr "Onayla"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "Ekle"
 
@@ -5896,7 +5926,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "Gönderen olarak gönderme yapılamadı ya da hatalı karakter"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "Elbise: %d"
@@ -5912,40 +5942,40 @@ msgid "Away outfit"
 msgstr "Uzak elbisesi"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "Sunucu değiştir"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "Karakter değiştir"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "Onayla:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "E-Posta:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5953,128 +5983,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "Yükle"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "Alt oyun sunucuları için aynı IP' yi kullan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Sunucu listesi indiriliyor...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "İndirmeye hazırlanılıyor"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "Sunucu listesi alma hatası!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "daha yeni bir sürüm gerektirir"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "v%s gerektirir"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "Uygula"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "Kişisel Mağaza"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "Nesne satın al"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "Nesne sat"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "Duyuru"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "Duyuruda linkleri göster"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
@@ -6103,277 +6133,277 @@ msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s kullanıcısı %s loncasına davet edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "%s loncasından çıkış istendi."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "Loncaya üye davet et"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "%s loncasına kimi davet etmek istersin?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "Loncadan ayrıl?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "%s loncasından ayrılmak istediğine emin misin?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Grup"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s adlı oyuncu gruba davet edildi."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grup %s 'ten çıkış istendi."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr "Üye Gruba Daveti"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Grup %s 'e kimi davet etmek istersin?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "Gruptan ayrıl?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "%s grubundan ayrılmak istediğinize emin misin?"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr "Navigasyon"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr "Öncelikli canavarlar"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "Saldırılacak canavarlar"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr "Canavarları görmezden gel"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr "Nesneleri Topla"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr "Nesneleri görmezden gel"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "Grup kur"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "Davet et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s 'ten gelen grup daveti kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s 'ten gelen grup daveti reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "%s isimli lonca oluşturuluyor."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "%s adlı grup kuruluyor."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "Lonca Adı"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "Loncanızın adını seçiniz."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr "Lonca isteği alındı, ancak halihazırda bir tane var."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s seni %s loncasına katılmaya davet etti."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "Lonca davetini kabul et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "Bir grup daveti aldın, ancak zaten bir gruba dahilsin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "Bir gruba katılma daveti aldın."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s grubuna katılmaya davet edildin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s seni gruplarına davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s seni %s grubuna davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr "Grup Adı"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
@@ -6415,149 +6445,104 @@ msgstr "Karakter Puanları: %d"
 msgid "Correction points: %d"
 msgstr "Düzeltme puanları: %d"
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "Hedef yok"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr "Hedefe izin ver"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr "Hedef gerekli"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr "Genel Büyü"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "Yaşam Büyüsü"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "Savaş Büyüsü"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "Dönüşüm Büyüsü"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "Doğa Büyüsü"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "Astral Büyü"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "Komut Editörü"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "büyü"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "diğer"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "Sembol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "Komut:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "Hedef Tipi:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "İkon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "Büyü Leveli:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "Büyü Okulu:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "Okul leveli:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "Kayıt"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "Takas teklif et"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "Doğrulandı. Bekleniyor..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Takası kabul et"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "Kabul edildi. Bekleniyor..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "Takas: Sen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "%s alıyorsun"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "Değiştir"
 
@@ -6567,12 +6552,12 @@ msgid "You give:"
 msgstr "Verdiğin:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
@@ -6585,36 +6570,36 @@ msgid "Name: %s"
 msgstr "İsim: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 Güncelleme işlemi tamamlanamadı."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Şiddetle tavsiye edilir ki"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr "##1 daha sonra tekrar deneyiniz."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -6644,42 +6629,42 @@ msgid "Who Is Online - Update"
 msgstr "Kimler Online - Güncelle"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "Dünya Seç"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "Hesabı Değiştir"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "Dünya Seç"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6687,7 +6672,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6822,163 +6807,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Güç:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Çeviklik:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Yaşam Gücü:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Zeka:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Maharet:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr "Yanlış yer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Fısıltı gönderilemedi, %s tarafından görmezden gelindi."
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7030,58 +7015,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Hesap bulunamadı. Lütfen tekrar giriş yapın."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "Eski şifre hatalı."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "Bilinemeyen hata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "Hesap silinmiş."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7089,22 +7074,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7124,289 +7109,289 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "Takas başarılı olamadı!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "Gruba katılınamadı!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "Başka birisi bu hesabı kullanmaya çalışıyor."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "Zaten bu hesaba bağlanıldı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "Güç"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "Çeviklik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "Yaşam Gücü"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "Zeka"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "Maharet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "Şans"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s sana takas isteği yolladı, kabul ediyor musun?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Takas: Sen ve %s"
@@ -7776,7 +7761,7 @@ msgstr "Güvenli OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "isimsiz"
 
diff --git a/po/vls.po b/po/vls.po
index 2e1f4be2e..e4514ff6d 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -18,87 +18,87 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -106,387 +106,387 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -496,42 +496,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -543,13 +543,13 @@ msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -562,11 +562,11 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr ""
 
@@ -586,17 +586,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,83 +611,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr ""
 
@@ -887,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -928,65 +928,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -994,7 +1215,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr ""
@@ -1008,49 +1229,49 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1068,9 +1289,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1079,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1090,9 +1311,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr ""
 
@@ -1103,9 +1324,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr ""
 
@@ -1113,26 +1334,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1140,7 +1361,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1148,7 +1369,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1171,69 +1392,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1243,20 +1464,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1265,77 +1486,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1345,68 +1566,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1415,64 +1636,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1480,57 +1701,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1538,134 +1758,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1673,9 +1893,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr ""
 
@@ -1683,22 +1903,22 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1706,56 +1926,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1870,10 +2090,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr ""
 
@@ -2435,12 +2655,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2460,11 +2680,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr ""
 
@@ -2500,23 +2719,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2524,7 +2743,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2580,7 +2799,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2606,7 +2825,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2740,99 +2959,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2843,30 +3002,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2880,157 +3039,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3053,8 +3208,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3223,100 +3378,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3325,50 +3480,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3383,279 +3538,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3663,279 +3808,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4016,401 +4161,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr ""
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4520,323 +4624,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr ""
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4848,7 +4943,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4857,61 +4952,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4921,9 +4976,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4933,18 +4988,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr ""
 
@@ -4953,7 +5008,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5001,7 +5056,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5010,7 +5065,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr ""
@@ -5043,7 +5098,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5051,9 +5106,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr ""
 
@@ -5061,11 +5116,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5074,134 +5129,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5211,48 +5266,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,12 +5303,12 @@ msgid "Yes"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5498,61 +5538,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5562,47 +5602,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5713,62 +5753,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5845,17 +5875,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5864,9 +5894,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr ""
 
@@ -5886,7 +5916,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5902,40 +5932,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5943,128 +5973,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6093,277 +6123,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6405,149 +6435,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr ""
 
@@ -6557,12 +6542,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6574,36 +6559,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr ""
 
@@ -6633,42 +6618,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6676,7 +6661,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6811,163 +6796,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7019,58 +7004,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7078,22 +7063,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7113,290 +7098,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7766,7 +7751,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bc180a5a4..ae786b51c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-15 12:09+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -24,474 +24,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr "你被 %s 杀掉了"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr "(a) 攻击所有玩家"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr "距离"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3886
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3892 src/being/localplayer.cpp:3917
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3902
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3908 src/being/localplayer.cpp:3922
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4265
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -501,42 +501,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr "完全忽略"
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr "流动的泡沫"
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:60
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -548,13 +548,13 @@ msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "帮助"
@@ -567,11 +567,11 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "关闭"
 
@@ -591,17 +591,17 @@ msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -616,83 +616,83 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr "密码更改成功！"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功！"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来... ..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出。"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出。"
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "未知命令。"
 
@@ -892,25 +892,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -933,65 +933,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr "调试 "
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "网络错误"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "默认"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "黑色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "红色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "绿色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "蓝色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "金"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "黄色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "粉红色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "紫"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "灰色"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "棕色"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "彩虹1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "彩虹2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "彩虹3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "生活魔术"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "战魔"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "蜕变魔术"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "大自然的神奇"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "星芒魔术"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "中立"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "好友"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "被忽视的"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "忽略"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr "已删除"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "没有目标"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr "正常"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "自动关闭"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "跳过"
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "团队:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "工会:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "评论: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
@@ -999,7 +1220,7 @@ msgstr "重量：%s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "交易"
@@ -1013,49 +1234,49 @@ msgstr "交易"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1073,9 +1294,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr "移动"
@@ -1084,7 +1305,7 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "说话"
@@ -1095,9 +1316,9 @@ msgstr "说话"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "购买"
 
@@ -1108,9 +1329,9 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "出售"
 
@@ -1118,26 +1339,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1145,7 +1366,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1153,7 +1374,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1176,69 +1397,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:93
-#: src/gui/windows/socialwindow.cpp:1232
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr "地图项"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr "重命名"
 
@@ -1248,20 +1469,20 @@ msgstr "重命名"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1270,77 +1491,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1305
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr "留下"
 
@@ -1350,68 +1571,68 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr "名称："
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr "评论："
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1420,64 +1641,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -1485,57 +1706,56 @@ msgstr "检索所有"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:998
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr "(默认)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1543,134 +1763,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1678,9 +1898,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -1688,22 +1908,22 @@ msgstr "卸下装备"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr "掉落... ..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr "所有"
 
@@ -1711,56 +1931,56 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1875,10 +2095,10 @@ msgstr "选择OK"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "退出"
 
@@ -2440,12 +2660,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr "其他"
 
@@ -2465,11 +2685,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "删除"
 
@@ -2505,23 +2724,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr "快捷键"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2529,7 +2748,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:204
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "聊天"
 
@@ -2585,7 +2804,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "怪物"
 
@@ -2611,7 +2830,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "粒子效果"
 
@@ -2745,99 +2964,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:153
-msgid "black"
-msgstr "黑色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:155
-msgid "red"
-msgstr "红色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:157
-msgid "green"
-msgstr "绿色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:159
-msgid "blue"
-msgstr "蓝色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:161
-msgid "gold"
-msgstr "金"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:163
-msgid "yellow"
-msgstr "黄色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:165
-msgid "pink"
-msgstr "粉红色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:167
-msgid "purple"
-msgstr "紫"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:169
-msgid "grey"
-msgstr "灰色"
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:171
-msgid "brown"
-msgstr "棕色"
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -2848,30 +3007,30 @@ msgid "Battle"
 msgstr "战斗"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "全局公告："
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2885,157 +3044,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:182 src/gui/windows/socialwindow.cpp:317
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "帮会"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "音频"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr "启用音频"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr "启用音乐"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr "启用游戏SFX"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr "启用GUI SFX"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "音效声量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "音乐声量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr "启用语音聊天"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr "下载音乐"
 
@@ -3058,8 +3213,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "颜色"
 
@@ -3228,100 +3383,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr "类型:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr "延迟："
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr "红色："
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr "绿色："
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr "蓝色："
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "静止的"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "脉冲"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "彩虹"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "色谱"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr "阿尔法："
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr "取消分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "预设"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3330,50 +3485,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "校准"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "游戏杆"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3388,279 +3543,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:151
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr "默认"
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "低"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "中"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "高"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr "杂项"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "显示损坏造成的，以怪物"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr "自动目标只有到达怪物"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr "突出显示怪物的攻击范围"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr "显示怪物HP栏"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
 #: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "地图"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr "突出显示的地图门户网站"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr "突出地板项目"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr "突出显示球员的攻击范围"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr "绘制路径"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr "移动"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr "自动修复的位置"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr "同步播放移动"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr "显示工作"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3668,279 +3813,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "商店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr "挂机支持"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr "显示背景"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr "硬件加速"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4021,401 +4166,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "姓名"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "关系"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "中立"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "好友"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "被忽视的"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "忽略"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr "已删除"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "允许交易"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "允许密语"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr "关系"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "当忽略时："
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr "小（10）"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr "小 (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr "中 (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr "桂主题"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr "主要字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr "加粗字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr "粒子字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr "帮助字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr "安全字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr "日文字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "字体大小"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr "主题更改"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr "正常"
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4525,323 +4629,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "无文本"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "文本"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "气泡，无名"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "有名气泡"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "关闭"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "头顶文字"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "环境音效"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr "l"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr "谁在线"
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr "挂机检查"
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr "杀敌统计"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr "表情符号"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "状态"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "装备"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "物品栏"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "技能"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr "特价商品"
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1278
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr "你知道吗"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
@@ -4853,7 +4948,7 @@ msgstr "挂机检查"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "重置"
 
@@ -4862,61 +4957,21 @@ msgstr "重置"
 msgid "Result"
 msgstr "结果"
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4926,9 +4981,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
 
@@ -4938,18 +4993,18 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1301
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "建立"
 
@@ -4958,7 +5013,7 @@ msgstr "建立"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5006,7 +5061,7 @@ msgstr "电子邮件地址不匹配。"
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "更换密码"
 
@@ -5015,7 +5070,7 @@ msgstr "更换密码"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "密码："
@@ -5048,7 +5103,7 @@ msgid "The new password entries mismatch."
 msgstr "新的密码输入不匹配。"
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5056,9 +5111,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "姓名"
 
@@ -5066,11 +5121,11 @@ msgstr "姓名"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5079,134 +5134,134 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr "头发颜色："
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr "发型："
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "帅哥"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "美女"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr "登录"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "开始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "信息"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "注销"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr "变更电子邮件"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5216,48 +5271,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr "输入密码："
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:173
-msgid "rainbow 1"
-msgstr "彩虹1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:175
-msgid "rainbow 2"
-msgstr "彩虹2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:177
-msgid "rainbow 3"
-msgstr "彩虹3"
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:756
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1170
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1614
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5278,201 +5318,201 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:302
-#: src/gui/windows/debugwindow.cpp:353
+#: src/gui/windows/debugwindow.cpp:170 src/gui/windows/debugwindow.cpp:301
+#: src/gui/windows/debugwindow.cpp:352
 msgid "Music:"
 msgstr "音乐："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:308
-#: src/gui/windows/debugwindow.cpp:357
+#: src/gui/windows/debugwindow.cpp:172 src/gui/windows/debugwindow.cpp:307
+#: src/gui/windows/debugwindow.cpp:356
 msgid "Map:"
 msgstr "地图："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:175 src/gui/windows/debugwindow.cpp:305
-#: src/gui/windows/debugwindow.cpp:355
+#: src/gui/windows/debugwindow.cpp:174 src/gui/windows/debugwindow.cpp:304
+#: src/gui/windows/debugwindow.cpp:354
 msgid "Minimap:"
 msgstr "小地图："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:178 src/gui/windows/debugwindow.cpp:299
-#: src/gui/windows/debugwindow.cpp:351
+#: src/gui/windows/debugwindow.cpp:177 src/gui/windows/debugwindow.cpp:298
+#: src/gui/windows/debugwindow.cpp:350
 msgid "Cursor:"
 msgstr "光标："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:181
+#: src/gui/windows/debugwindow.cpp:180
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:321
-#: src/gui/windows/debugwindow.cpp:361
+#: src/gui/windows/debugwindow.cpp:183 src/gui/windows/debugwindow.cpp:320
+#: src/gui/windows/debugwindow.cpp:360
 msgid "Map actors count:"
 msgstr "地图演员数："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:186 src/gui/windows/debugwindow.cpp:280
-#: src/gui/windows/debugwindow.cpp:286
+#: src/gui/windows/debugwindow.cpp:185 src/gui/windows/debugwindow.cpp:279
+#: src/gui/windows/debugwindow.cpp:285
 msgid "Player Position:"
 msgstr "的位置："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:192 src/gui/windows/debugwindow.cpp:334
+#: src/gui/windows/debugwindow.cpp:191 src/gui/windows/debugwindow.cpp:333
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:197 src/gui/windows/debugwindow.cpp:342
+#: src/gui/windows/debugwindow.cpp:196 src/gui/windows/debugwindow.cpp:341
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/windows/debugwindow.cpp:200
+#: src/gui/windows/debugwindow.cpp:199
 #, c-format
 msgid "%d FPS"
 msgstr "%d的FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/windows/debugwindow.cpp:202 src/gui/windows/debugwindow.cpp:369
+#: src/gui/windows/debugwindow.cpp:201 src/gui/windows/debugwindow.cpp:368
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:213 src/gui/windows/debugwindow.cpp:237
+#: src/gui/windows/debugwindow.cpp:212 src/gui/windows/debugwindow.cpp:236
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (软件)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:220
+#: src/gui/windows/debugwindow.cpp:219
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:224
+#: src/gui/windows/debugwindow.cpp:223
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:228
+#: src/gui/windows/debugwindow.cpp:227
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:232
+#: src/gui/windows/debugwindow.cpp:231
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:257 src/gui/windows/debugwindow.cpp:327
+#: src/gui/windows/debugwindow.cpp:256 src/gui/windows/debugwindow.cpp:326
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:316
+#: src/gui/windows/debugwindow.cpp:315
 #, c-format
 msgid "Particle count: %d"
 msgstr "粒子数：%d个"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:427
-#: src/gui/windows/debugwindow.cpp:489
+#: src/gui/windows/debugwindow.cpp:375 src/gui/windows/debugwindow.cpp:426
+#: src/gui/windows/debugwindow.cpp:488
 msgid "Target:"
 msgstr "目标："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:378 src/gui/windows/debugwindow.cpp:433
-#: src/gui/windows/debugwindow.cpp:491
+#: src/gui/windows/debugwindow.cpp:377 src/gui/windows/debugwindow.cpp:432
+#: src/gui/windows/debugwindow.cpp:490
 msgid "Target Id:"
 msgstr "目标ID："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:381 src/gui/windows/debugwindow.cpp:436
-#: src/gui/windows/debugwindow.cpp:493
+#: src/gui/windows/debugwindow.cpp:380 src/gui/windows/debugwindow.cpp:435
+#: src/gui/windows/debugwindow.cpp:492
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:383
+#: src/gui/windows/debugwindow.cpp:382
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:385 src/gui/windows/debugwindow.cpp:452
+#: src/gui/windows/debugwindow.cpp:384 src/gui/windows/debugwindow.cpp:451
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:387
+#: src/gui/windows/debugwindow.cpp:386
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:389
+#: src/gui/windows/debugwindow.cpp:388
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:477
-#: src/gui/windows/debugwindow.cpp:483 src/gui/windows/debugwindow.cpp:501
+#: src/gui/windows/debugwindow.cpp:390 src/gui/windows/debugwindow.cpp:476
+#: src/gui/windows/debugwindow.cpp:482 src/gui/windows/debugwindow.cpp:500
 msgid "Attack delay:"
 msgstr "攻击延迟："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:464
-#: src/gui/windows/debugwindow.cpp:503
+#: src/gui/windows/debugwindow.cpp:392 src/gui/windows/debugwindow.cpp:463
+#: src/gui/windows/debugwindow.cpp:502
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:467
-#: src/gui/windows/debugwindow.cpp:505
+#: src/gui/windows/debugwindow.cpp:394 src/gui/windows/debugwindow.cpp:466
+#: src/gui/windows/debugwindow.cpp:504
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:397 src/gui/windows/debugwindow.cpp:470
-#: src/gui/windows/debugwindow.cpp:507
+#: src/gui/windows/debugwindow.cpp:396 src/gui/windows/debugwindow.cpp:469
+#: src/gui/windows/debugwindow.cpp:506
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:441 src/gui/windows/debugwindow.cpp:447
-#: src/gui/windows/debugwindow.cpp:495
+#: src/gui/windows/debugwindow.cpp:440 src/gui/windows/debugwindow.cpp:446
+#: src/gui/windows/debugwindow.cpp:494
 msgid "Target Level:"
 msgstr "目标水平："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:455 src/gui/windows/debugwindow.cpp:497
+#: src/gui/windows/debugwindow.cpp:454 src/gui/windows/debugwindow.cpp:496
 msgid "Target Party:"
 msgstr "目标："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:459 src/gui/windows/debugwindow.cpp:499
+#: src/gui/windows/debugwindow.cpp:458 src/gui/windows/debugwindow.cpp:498
 msgid "Target Guild:"
 msgstr "目标公会："
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:544 src/gui/windows/debugwindow.cpp:550
+#: src/gui/windows/debugwindow.cpp:543 src/gui/windows/debugwindow.cpp:549
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:553
+#: src/gui/windows/debugwindow.cpp:552
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "输入:%d 字节/"
 
 #. TRANSLATORS: debug window label
-#: src/gui/windows/debugwindow.cpp:556
+#: src/gui/windows/debugwindow.cpp:555
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -5503,61 +5543,61 @@ msgstr "自动打开这个窗口"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "确定"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr "连接"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "端口："
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr "服务器类型："
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5567,47 +5607,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr "添加到购买商店。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr "添加到出售商店。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr "未知。"
 
@@ -5716,62 +5756,52 @@ msgstr "%s %d?"
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr "自动关闭"
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr "跳过"
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "登录"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr "记住用户名"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr "更新日期："
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr "更改服务器"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "注册"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr "自定义更新主机"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "服务器："
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5848,17 +5878,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "提交"
 
@@ -5867,9 +5897,9 @@ msgstr "提交"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "添加"
 
@@ -5889,7 +5919,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
@@ -5905,40 +5935,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "交换服务器"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "交换角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "确认："
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "电子邮件"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5946,128 +5976,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr "负载"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr "准备下载"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:91
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "应用"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr "个人商店"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr "购买物品"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr "出售物品"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr "公布"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
@@ -6096,277 +6126,277 @@ msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:223
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:238
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:252
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:264
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:299 src/gui/windows/socialwindow.cpp:370
-#: src/gui/windows/socialwindow.cpp:494
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:385 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "t"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:425
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:440
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:466
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr "离开团队?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:693
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:720
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:822
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1049
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1068
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1070
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1072
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1096
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1115
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1117
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1206
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1229 src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr "建立"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1292
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1297
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1497
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1508
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1525
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1539
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1579
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1600
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1615
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr "公会名称"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1617
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1633
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1641
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1648
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1676
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1681
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1690
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1706
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/windows/socialwindow.cpp:1722
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1730
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -6408,149 +6438,104 @@ msgstr "角色可用点: %d"
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr "没有目标"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr "生活魔术"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr "战魔"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr "蜕变魔术"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr "大自然的神奇"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr "星芒魔术"
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr "命令编辑器"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr "魔术"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr "其他"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr "符号："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr "命令："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr "目标类型："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr "图示："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr "法力："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr "魔法等级："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr "魔法学院："
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr "学校层次："
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr "保存"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "打算交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "同意交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "交易：你"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "改变"
 
@@ -6560,12 +6545,12 @@ msgid "You give:"
 msgstr "你给予："
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -6576,36 +6561,36 @@ msgid "Name: %s"
 msgstr "姓名：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "更新..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "已完成"
 
@@ -6635,42 +6620,42 @@ msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr "选择世界"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr "切换登陆"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr "选择世界"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6813,163 +6798,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "力量："
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "敏捷："
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "生命："
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "智力："
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "灵巧："
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "幸运："
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr "错误的名称。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr "不正确的统计。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr "不正确的头发。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr "角色已删除。"
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr "删除角色失败。"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "密语无法发送，%s离线。"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr "游戏"
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr "工会会长: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr "工会等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr "在线玩家: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr "最大成员: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr "平均等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr "工会经验值: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "工会下一级所需经验: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7021,58 +7006,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr "旧密码不正确。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr "新密码太短。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr "未知的错误。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr "未注册的ID。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr "错误的密码。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr "账户过期失效。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr "客户端太旧。"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7082,22 +7067,22 @@ msgstr ""
 "请通过论坛联系GM组"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7117,289 +7102,289 @@ msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr "讯息"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr "交易失败！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr "你无法办到！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币…… ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr "传送失败..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr "身份验证失败。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr "没有可用的服务器。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr "此帐户已登录。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr "检测速度劈。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr "重复登录。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr "未知的连接错误。"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "生命"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "智慧"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受？"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和%s"
@@ -7769,7 +7754,7 @@ msgstr "安全的OpenGL"
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index bc03b0776..691831dec 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,474 +19,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -496,42 +496,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -543,13 +543,13 @@ msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "說明"
@@ -562,11 +562,11 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "關閉"
 
@@ -586,17 +586,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,83 +611,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "不明指令"
 
@@ -887,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -928,65 +928,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr ""
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "中立"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "好友"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "忽略"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -994,7 +1215,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "交易"
@@ -1008,49 +1229,49 @@ msgstr "交易"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1068,9 +1289,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1079,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr ""
@@ -1090,9 +1311,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "購買"
 
@@ -1103,9 +1324,9 @@ msgstr "購買"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "出售"
 
@@ -1113,26 +1334,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1140,7 +1361,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1148,7 +1369,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1171,69 +1392,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1243,20 +1464,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1265,77 +1486,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1345,68 +1566,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1415,64 +1636,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1480,57 +1701,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1538,134 +1758,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1673,9 +1893,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -1683,22 +1903,22 @@ msgstr "卸下裝備"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1706,56 +1926,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1870,10 +2090,10 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "離開"
 
@@ -2435,12 +2655,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2460,11 +2680,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "刪除"
 
@@ -2500,23 +2719,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2524,7 +2743,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr ""
 
@@ -2580,7 +2799,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr ""
 
@@ -2606,7 +2825,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr ""
 
@@ -2740,99 +2959,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2843,30 +3002,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "主要公告："
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2880,157 +3039,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "音效"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "音效音量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "音樂音量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3053,8 +3208,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr ""
 
@@ -3223,100 +3378,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "預設"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3325,50 +3480,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "矯正"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "搖桿"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3383,279 +3538,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "低"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "中"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "高"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3663,279 +3808,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "商店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4016,401 +4161,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "名字"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "關係"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "中立"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "好友"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "忽略"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "允許交易"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "允許密語"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "當忽略時："
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4520,323 +4624,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr ""
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "關閉"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "狀態"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "裝備"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "物品攔"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "技能"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4848,7 +4943,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4857,61 +4952,21 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4921,9 +4976,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
 
@@ -4933,18 +4988,18 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "創造"
 
@@ -4953,7 +5008,7 @@ msgstr "創造"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5001,7 +5056,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr ""
 
@@ -5010,7 +5065,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "密碼："
@@ -5043,7 +5098,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5051,9 +5106,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "名字："
 
@@ -5061,11 +5116,11 @@ msgstr "名字："
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5074,134 +5129,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "男生"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "女生"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "開始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "註冊"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5211,48 +5266,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,12 +5303,12 @@ msgid "Yes"
 msgstr "是"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5498,61 +5538,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "Port："
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5562,47 +5602,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5711,62 +5751,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "登入"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "註冊"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "伺服器："
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5843,17 +5873,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "下一個"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5862,9 +5892,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "增加"
 
@@ -5884,7 +5914,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5900,40 +5930,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "交換伺服器"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "交換角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "確認："
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "電子郵件"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5941,128 +5971,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "確定"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6091,277 +6121,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6403,149 +6433,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "是否交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "更改"
 
@@ -6555,12 +6540,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -6572,36 +6557,36 @@ msgid "Name: %s"
 msgstr "名字：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "更新中..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "已完成"
 
@@ -6631,42 +6616,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6674,7 +6659,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6809,163 +6794,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7017,58 +7002,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7076,22 +7061,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7111,290 +7096,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "體力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7764,7 +7749,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ecb6db6ab..a64ce6c9c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-13 12:04+0300\n"
-"PO-Revision-Date: 2014-02-14 08:13+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,474 +19,474 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:874
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:884
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:329
+#: src/being/being.cpp:330
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:543
+#: src/being/being.cpp:496
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:391
+#: src/being/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1376
+#: src/being/localplayer.cpp:816
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1380
+#: src/being/localplayer.cpp:820
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1384
+#: src/being/localplayer.cpp:824
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1388
+#: src/being/localplayer.cpp:828
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1392
+#: src/being/localplayer.cpp:832
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1396
+#: src/being/localplayer.cpp:836
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1400
+#: src/being/localplayer.cpp:840
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1424
+#: src/being/localplayer.cpp:864
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1629 src/being/localplayer.cpp:1664
-#: src/being/localplayer.cpp:1665
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1670 src/being/localplayer.cpp:1677
-#: src/being/localplayer.cpp:1684
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1285
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1287
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1289
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1291
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1878
+#: src/being/localplayer.cpp:1293
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1880
+#: src/being/localplayer.cpp:1295
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1903
+#: src/being/localplayer.cpp:1318
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1909
+#: src/being/localplayer.cpp:1324
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1914
+#: src/being/localplayer.cpp:1329
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1344
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1346
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1348
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1350
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1352
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1354
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1356
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1358
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1945
+#: src/being/localplayer.cpp:1360
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1947
+#: src/being/localplayer.cpp:1362
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1382
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1384
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1386
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1973
+#: src/being/localplayer.cpp:1388
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1975
+#: src/being/localplayer.cpp:1390
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1995 src/being/localplayer.cpp:2003
-#: src/being/localplayer.cpp:2031
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1997 src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1999
+#: src/being/localplayer.cpp:1414
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2001
+#: src/being/localplayer.cpp:1416
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:1440
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1442
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2029
+#: src/being/localplayer.cpp:1444
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:1498
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:1500
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:1502
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:1504
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:1506
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:1508
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2095
+#: src/being/localplayer.cpp:1510
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2097
+#: src/being/localplayer.cpp:1512
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:1526
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:1528
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:1530
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:1532
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2119
+#: src/being/localplayer.cpp:1534
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2121
+#: src/being/localplayer.cpp:1536
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:1556
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:1558
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:1560
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:1562
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2149
+#: src/being/localplayer.cpp:1564
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2151
+#: src/being/localplayer.cpp:1566
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:1586
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:1588
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:1590
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2177
+#: src/being/localplayer.cpp:1592
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2179
+#: src/being/localplayer.cpp:1594
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:1614
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2201
+#: src/being/localplayer.cpp:1616
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2203
+#: src/being/localplayer.cpp:1618
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2232
+#: src/being/localplayer.cpp:1647
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2255
+#: src/being/localplayer.cpp:1670
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2257
+#: src/being/localplayer.cpp:1672
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2259 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:1688
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2275
+#: src/being/localplayer.cpp:1690
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:1717
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:1719
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2306
+#: src/being/localplayer.cpp:1721
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -496,42 +496,42 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
-#: src/gui/popups/popupmenu.cpp:2566
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2526
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Completely ignore"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:483
+#: src/being/playerrelations.cpp:485
 msgid "Print '...'"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:506
+#: src/being/playerrelations.cpp:508
 msgid "Blink name"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:552
+#: src/being/playerrelations.cpp:554
 msgid "Floating '...' bubble"
 msgstr ""
 
 #. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:556
+#: src/being/playerrelations.cpp:558
 msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1138 src/gui/windowmenu.cpp:165
-#: src/gui/windows/setupwindow.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
+#: src/gui/windows/setupwindow.cpp:61
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
 msgid "Performance"
 msgstr ""
 
@@ -543,13 +543,13 @@ msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "說明"
@@ -562,11 +562,11 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
-#: src/gui/windows/shopwindow.cpp:77
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
+#: src/gui/windows/shopwindow.cpp:78
 msgid "Close"
 msgstr "關閉"
 
@@ -586,17 +586,17 @@ msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1491
+#: src/client.cpp:1489
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1531
+#: src/client.cpp:1529
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1541
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,83 +611,83 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
-#: src/gui/windows/charselectdialog.cpp:297
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:349
+#: src/gui/windows/charselectdialog.cpp:299
+#: src/gui/windows/editserverdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:260
 #: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1628
+#: src/client.cpp:1625
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1669
+#: src/client.cpp:1666
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1671
+#: src/client.cpp:1668
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1693
+#: src/client.cpp:1690
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1695
+#: src/client.cpp:1692
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1718
+#: src/client.cpp:1715
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1720
+#: src/client.cpp:1717
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
-#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2229
+#: src/client.cpp:2232
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2270 src/client.cpp:2277
+#: src/client.cpp:2273 src/client.cpp:2280
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/client.cpp:2299 src/client.cpp:2316
+#: src/client.cpp:2302 src/client.cpp:2319
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3000
+#: src/client.cpp:3003
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: chat commands handling message
-#: src/commandhandler.cpp:97
+#: src/commandhandler.cpp:99
 msgid "Unknown command."
 msgstr "不明指令"
 
@@ -887,25 +887,25 @@ msgstr ""
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/commands.cpp:1342
+#: src/commands.cpp:1344
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/commands.cpp:1349
+#: src/commands.cpp:1352
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/commands.cpp:1356
+#: src/commands.cpp:1360
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1476 src/commands.cpp:1485
+#: src/commands.cpp:1481 src/commands.cpp:1490
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1479 src/commands.cpp:1488
+#: src/commands.cpp:1484 src/commands.cpp:1493
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -928,65 +928,286 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:462
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:464
-#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:572
+#: src/game.cpp:563
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:573
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:653
+#: src/game.cpp:644
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:656
+#: src/game.cpp:647
 msgid "Network Error"
 msgstr "網路錯誤"
 
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:33
+msgid "Neutral"
+msgstr "中立"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Friend"
+msgstr "好友"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Disregarded"
+msgstr "不理"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Ignored"
+msgstr "忽略"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Erased"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Blacklisted"
+msgstr ""
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Enemy"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr ""
+
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:195
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -994,7 +1215,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
+#: src/gui/popups/popupmenu.cpp:153 src/gui/popups/popupmenu.cpp:692
 #: src/gui/widgets/tabs/tradetab.cpp:33
 msgid "Trade"
 msgstr "交易"
@@ -1008,49 +1229,49 @@ msgstr "交易"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:695 src/gui/setupactiondata.h:51
 #: src/gui/windows/botcheckerwindow.cpp:303
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:289
 msgid "Attack"
 msgstr "攻擊"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:366
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:699
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
+#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:201
+#: src/gui/popups/popupmenu.cpp:412 src/gui/popups/popupmenu.cpp:746
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
+#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:753
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:218 src/gui/popups/popupmenu.cpp:429
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:223
+#: src/gui/popups/popupmenu.cpp:225
 msgid "Nuke"
 msgstr ""
 
@@ -1068,9 +1289,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
+#: src/gui/popups/popupmenu.cpp:228 src/gui/popups/popupmenu.cpp:249
+#: src/gui/popups/popupmenu.cpp:396 src/gui/popups/popupmenu.cpp:547
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:787
 #: src/gui/setupactiondata.h:1942 src/gui/windows/botcheckerwindow.cpp:307
 msgid "Move"
 msgstr ""
@@ -1079,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/popups/popupmenu.cpp:239 src/gui/setupactiondata.h:93
 #: src/gui/windows/botcheckerwindow.cpp:305
 msgid "Talk"
 msgstr "說話"
@@ -1090,9 +1311,9 @@ msgstr "說話"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
-#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
 msgid "Buy"
 msgstr "購買"
 
@@ -1103,9 +1324,9 @@ msgstr "購買"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
-#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
-#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:56
+#: src/gui/windows/selldialog.cpp:66 src/gui/windows/selldialog.cpp:108
 msgid "Sell"
 msgstr "出售"
 
@@ -1113,26 +1334,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:270
+#: src/gui/popups/popupmenu.cpp:272
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:279
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Add to attack list"
 msgstr ""
 
@@ -1140,7 +1361,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
+#: src/gui/popups/popupmenu.cpp:287 src/gui/popups/popupmenu.cpp:2683
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1148,7 +1369,7 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:437
 msgid "Add name to chat"
 msgstr ""
 
@@ -1171,69 +1392,69 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
-#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
-#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
-#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1827
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:343
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:488
+#: src/gui/popups/popupmenu.cpp:523 src/gui/popups/popupmenu.cpp:554
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:825
+#: src/gui/popups/popupmenu.cpp:1957 src/gui/popups/popupmenu.cpp:1993
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2085
+#: src/gui/popups/popupmenu.cpp:2126 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2377 src/gui/popups/popupmenu.cpp:2404
+#: src/gui/popups/popupmenu.cpp:2421 src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2837 src/gui/setupactiondata.h:1827
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charcreatedialog.cpp:121
 #: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:78
-#: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setupwindow.cpp:92
-#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:185
+#: src/gui/windows/updaterwindow.cpp:186
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:320 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:470 src/gui/popups/popupmenu.cpp:479
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
+#: src/gui/popups/popupmenu.cpp:484 src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2071
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
+#: src/gui/popups/popupmenu.cpp:505 src/gui/popups/popupmenu.cpp:537
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:506
+#: src/gui/popups/popupmenu.cpp:508
 msgid "Rename"
 msgstr ""
 
@@ -1243,20 +1464,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2302
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:543
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:550
 msgid "Move camera"
 msgstr ""
 
@@ -1265,77 +1486,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
+#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:568
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:595
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:624 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:629
+#: src/gui/popups/popupmenu.cpp:631
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:635
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:641
+#: src/gui/popups/popupmenu.cpp:643
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:649
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:653
+#: src/gui/popups/popupmenu.cpp:655
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:661
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1304
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
 msgid "Leave"
 msgstr ""
 
@@ -1345,68 +1566,68 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
-#: src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:673 src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2417
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:720 src/gui/popups/popupmenu.cpp:2641
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:805
+#: src/gui/popups/popupmenu.cpp:807
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1328
+#: src/gui/popups/popupmenu.cpp:1330
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1330
+#: src/gui/popups/popupmenu.cpp:1332
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1354
+#: src/gui/popups/popupmenu.cpp:1356
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1356
+#: src/gui/popups/popupmenu.cpp:1358
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1870
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1877
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1879
+#: src/gui/popups/popupmenu.cpp:1881
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:1884
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1885
+#: src/gui/popups/popupmenu.cpp:1887
 msgid "Add to trade all"
 msgstr ""
 
@@ -1415,64 +1636,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setupwindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
 msgid "Store"
 msgstr "寄放"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1900
+#: src/gui/popups/popupmenu.cpp:1902
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1906
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1907
+#: src/gui/popups/popupmenu.cpp:1909
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1910
+#: src/gui/popups/popupmenu.cpp:1912
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1931
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1933
+#: src/gui/popups/popupmenu.cpp:1935
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1936
+#: src/gui/popups/popupmenu.cpp:1938
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1939
+#: src/gui/popups/popupmenu.cpp:1941
 msgid "Retrieve all"
 msgstr ""
 
@@ -1480,57 +1701,56 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2081
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2173
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2180
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2187
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/windows/statuswindow.cpp:168
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
-#: src/gui/widgets/tabs/setup_theme.cpp:60
-#: src/gui/widgets/tabs/setup_theme.cpp:147
-#: src/gui/windows/socialwindow.cpp:997
+#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:2231 src/gui/popups/popupmenu.cpp:2250
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2256
 msgid "Move down"
 msgstr ""
 
@@ -1538,134 +1758,134 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2660
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2350
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2390
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2464
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2508 src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2565
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
-#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2550
 #: src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
-#: src/gui/popups/popupmenu.cpp:2551
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2512
+#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2514
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
-#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2517 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2505 src/gui/popups/popupmenu.cpp:2523
+#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2585
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/popups/popupmenu.cpp:2624
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2627
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2655
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2728
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2735
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Protect item"
 msgstr ""
 
@@ -1673,9 +1893,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:682
+#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -1683,22 +1903,22 @@ msgstr "卸下裝備"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Drop all"
 msgstr ""
 
@@ -1706,56 +1926,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:795
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2803
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2809
+#: src/gui/popups/popupmenu.cpp:2811
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:2816
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2817
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2822
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2823
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Kick"
 msgstr ""
 
@@ -1870,10 +2090,10 @@ msgstr "選擇確定"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
-#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
+#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
+#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:198
 msgid "Quit"
 msgstr "離開"
 
@@ -2435,12 +2655,12 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_audio.cpp:146
 #: src/gui/widgets/tabs/setup_chat.cpp:180
-#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:188
-#: src/gui/windows/charcreatedialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/registerdialog.cpp:116
 msgid "Other"
 msgstr ""
 
@@ -2460,11 +2680,10 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
-#: src/gui/windows/charselectdialog.cpp:106
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
-#: src/gui/windows/shopwindow.cpp:100
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
 msgid "Delete"
 msgstr "刪除"
 
@@ -2500,23 +2719,23 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:307
-#: src/gui/windowmenu.cpp:161
+#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
+#: src/gui/windowmenu.cpp:151
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:49
-#: src/gui/windows/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1948 src/gui/windows/emotewindow.cpp:50
+#: src/gui/windows/emotewindow.cpp:108
 msgid "Emotes"
 msgstr ""
 
@@ -2524,7 +2743,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
 msgid "Chat"
 msgstr "聊天"
 
@@ -2580,7 +2799,7 @@ msgstr "電腦"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:100
+#: src/gui/userpalette.cpp:129 src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Monsters"
 msgstr "怪物"
 
@@ -2606,7 +2825,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:154
 msgid "Particle effects"
 msgstr "粒子效果"
 
@@ -2740,99 +2959,39 @@ msgstr ""
 msgid "Tiles border"
 msgstr ""
 
-#: src/gui/widgets/characterdisplay.cpp:134
+#: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:600
+#: src/gui/widgets/characterdisplay.cpp:137
+#: src/gui/windows/inventorywindow.cpp:568
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
 
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: color name
-#. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
-msgid "brown"
-msgstr ""
-
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:323
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:93
+#: src/gui/widgets/itemlinkhandler.cpp:95
 msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
+#: src/gui/windows/serverdialog.cpp:204
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:595
+#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:595
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -2843,30 +3002,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:154
+#: src/gui/widgets/tabs/chattab.cpp:156
 msgid "Global announcement:"
 msgstr "主要公告："
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:160
+#: src/gui/widgets/tabs/chattab.cpp:162
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:186
+#: src/gui/widgets/tabs/chattab.cpp:188
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:537
+#: src/gui/widgets/tabs/chattab.cpp:539
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:542
+#: src/gui/widgets/tabs/chattab.cpp:544
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2880,157 +3039,153 @@ msgstr ""
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
+#: src/net/ea/gui/guildtab.cpp:44
 msgid "Guild"
 msgstr "公會"
 
 #. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/tabs/langtab.cpp:31
+#: src/gui/widgets/tabs/langtab.cpp:32
 msgid "Lang"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_audio.cpp:47
-msgid "(no sound)"
-msgstr ""
-
 #. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:48
 msgid "Audio"
 msgstr "音效"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:56
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:59
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:62
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:66
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:70
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:74
 msgid "Sfx volume"
 msgstr "音效音量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:78
 msgid "Music volume"
 msgstr "音樂音量"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:82
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:86
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:90
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:92
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:94
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:96
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:98
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:106
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:110
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:114
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:118
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:122
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:126
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:130
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:134
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:138
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:142
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:150
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Download music"
 msgstr ""
 
@@ -3053,8 +3208,8 @@ msgstr ""
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:61
-#: src/gui/widgets/tabs/setup_colors.cpp:83
-#: src/gui/windows/emotewindow.cpp:109
+#: src/gui/widgets/tabs/setup_colors.cpp:85
+#: src/gui/windows/emotewindow.cpp:110
 msgid "Colors"
 msgstr "顏色"
 
@@ -3223,100 +3378,100 @@ msgstr ""
 msgid "Show motd server message on start"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_colors.cpp:46
+#: src/gui/widgets/tabs/setup_colors.cpp:47
 msgid "This is what the color looks like"
 msgstr "這是顏色看起來的樣子"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:62
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:64
-#: src/gui/widgets/tabs/setup_colors.cpp:337
+#: src/gui/widgets/tabs/setup_colors.cpp:66
+#: src/gui/widgets/tabs/setup_colors.cpp:339
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:70
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:74
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:78
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:102
-#: src/gui/widgets/tabs/setup_colors.cpp:404
+#: src/gui/widgets/tabs/setup_colors.cpp:104
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Static"
 msgstr "狀態"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:108
-#: src/gui/widgets/tabs/setup_colors.cpp:406
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "暫停"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:110
-#: src/gui/widgets/tabs/setup_colors.cpp:113
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:112
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "彩虹"
 
 #. TRANSLATORS: color type
-#: src/gui/widgets/tabs/setup_colors.cpp:115
-#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:408
+#: src/gui/widgets/tabs/setup_colors.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "光譜"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:331
+#: src/gui/widgets/tabs/setup_colors.cpp:333
 msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:98
+#: src/gui/widgets/tabs/setup_input.cpp:99
 msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:100
+#: src/gui/widgets/tabs/setup_input.cpp:101
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:102
+#: src/gui/widgets/tabs/setup_input.cpp:103
 msgid "Default"
 msgstr "預設"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:104
+#: src/gui/widgets/tabs/setup_input.cpp:105
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:113
+#: src/gui/widgets/tabs/setup_input.cpp:115
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:200
+#: src/gui/widgets/tabs/setup_input.cpp:202
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3325,50 +3480,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:362
-#: src/gui/windows/questswindow.cpp:261
+#: src/gui/widgets/tabs/setup_input.cpp:364
+#: src/gui/windows/questswindow.cpp:249
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:46
-#: src/gui/widgets/tabs/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:138
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:48
-#: src/gui/widgets/tabs/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:135
 msgid "Calibrate"
 msgstr "矯正"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:54
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:58
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Joystick"
 msgstr "搖桿"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:144
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:147
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -3383,279 +3538,269 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:42
+#: src/gui/widgets/tabs/setup_other.cpp:43
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:44
+#: src/gui/widgets/tabs/setup_other.cpp:45
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:47
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:54
+#: src/gui/widgets/tabs/setup_other.cpp:55
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:56
+#: src/gui/widgets/tabs/setup_other.cpp:57
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:63
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
-#: src/gui/windows/inventorywindow.cpp:69
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:73
-#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/widgets/tabs/setup_other.cpp:74
+#: src/gui/widgets/tabs/setup_visual.cpp:56
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "low"
 msgstr "低"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_visual.cpp:160
 msgid "medium"
 msgstr "中"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:78
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
-#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:161
+#: src/gui/widgets/tabs/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_visual.cpp:58
+#: src/gui/widgets/tabs/setup_visual.cpp:162
 msgid "high"
 msgstr "高"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:82
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:84
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:103
+#: src/gui/widgets/tabs/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:107
+#: src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:111
+#: src/gui/widgets/tabs/setup_other.cpp:112
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:116
+#: src/gui/widgets/tabs/setup_other.cpp:117
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:120
+#: src/gui/widgets/tabs/setup_other.cpp:121
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
-#: src/gui/windows/debugwindow.cpp:71 src/gui/windows/minimap.cpp:51
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
+#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
 #: src/gui/windows/minimap.cpp:114
 msgid "Map"
 msgstr "地圖"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:128
+#: src/gui/widgets/tabs/setup_other.cpp:129
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:132
+#: src/gui/widgets/tabs/setup_other.cpp:133
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:136
+#: src/gui/widgets/tabs/setup_other.cpp:137
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:140
+#: src/gui/widgets/tabs/setup_other.cpp:141
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:145
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:149
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:152
+#: src/gui/widgets/tabs/setup_other.cpp:153
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:156
+#: src/gui/widgets/tabs/setup_other.cpp:157
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:160
+#: src/gui/widgets/tabs/setup_other.cpp:161
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:164
+#: src/gui/widgets/tabs/setup_other.cpp:165
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:168
+#: src/gui/widgets/tabs/setup_other.cpp:169
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:177
+#: src/gui/widgets/tabs/setup_other.cpp:178
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:181
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:184
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:188
+#: src/gui/widgets/tabs/setup_other.cpp:189
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:192
+#: src/gui/widgets/tabs/setup_other.cpp:193
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:196
+#: src/gui/widgets/tabs/setup_other.cpp:197
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:205
+#: src/gui/widgets/tabs/setup_other.cpp:206
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:207
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:211
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:216
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:219
+#: src/gui/widgets/tabs/setup_other.cpp:220
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:223
+#: src/gui/widgets/tabs/setup_other.cpp:224
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:227
+#: src/gui/widgets/tabs/setup_other.cpp:228
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:231
+#: src/gui/widgets/tabs/setup_other.cpp:232
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:235
+#: src/gui/widgets/tabs/setup_other.cpp:236
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:239
+#: src/gui/widgets/tabs/setup_other.cpp:240
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:243
+#: src/gui/widgets/tabs/setup_other.cpp:244
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:247
+#: src/gui/widgets/tabs/setup_other.cpp:248
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:250
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3663,279 +3808,279 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "商店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:258
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:262
+#: src/gui/widgets/tabs/setup_other.cpp:263
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:268 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:274
+#: src/gui/widgets/tabs/setup_other.cpp:275
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:279
+#: src/gui/widgets/tabs/setup_other.cpp:280
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:282
+#: src/gui/widgets/tabs/setup_other.cpp:283
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:293
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:295
+#: src/gui/widgets/tabs/setup_other.cpp:296
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:303
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:316
+#: src/gui/widgets/tabs/setup_other.cpp:317
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:320
+#: src/gui/widgets/tabs/setup_other.cpp:321
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:324
+#: src/gui/widgets/tabs/setup_other.cpp:325
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:333
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:337
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:349
+#: src/gui/widgets/tabs/setup_other.cpp:350
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:353
+#: src/gui/widgets/tabs/setup_other.cpp:354
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:357
+#: src/gui/widgets/tabs/setup_other.cpp:358
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:366
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:376
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:381
+#: src/gui/widgets/tabs/setup_other.cpp:382
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:386
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:390
+#: src/gui/widgets/tabs/setup_other.cpp:391
 msgid "Screen density override"
 msgstr ""
 
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/widgets/tabs/setup_perfomance.cpp:40
 #: src/gui/windows/confirmdialog.cpp:57
 msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:59
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:63
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:67
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:71
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:76
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:81
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:85
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:89
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:94
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:98
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:103
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:107
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:112
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:117
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:121
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:126
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:132
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:136
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:140
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:144
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:148
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:153
 msgid "Cache all sounds (can use additional memory)"
 msgstr ""
 
@@ -4016,401 +4161,360 @@ msgstr ""
 
 #. TRANSLATORS: relations table header
 #. TRANSLATORS: bot checker window table header
-#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/widgets/tabs/setup_relations.cpp:61
 #: src/gui/windows/botcheckerwindow.cpp:301
 msgid "Name"
 msgstr "名字"
 
 #. TRANSLATORS: relations table header
-#: src/gui/widgets/tabs/setup_relations.cpp:60
+#: src/gui/widgets/tabs/setup_relations.cpp:63
 msgid "Relation"
 msgstr "關係"
 
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:66
-msgid "Neutral"
-msgstr "中立"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:68
-msgid "Friend"
-msgstr "好友"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:70
-msgid "Disregarded"
-msgstr "不理"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:72
-msgid "Ignored"
-msgstr "忽略"
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:74
-msgid "Erased"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:76
-msgid "Blacklisted"
-msgstr ""
-
-#. TRANSLATORS: relation type
-#: src/gui/widgets/tabs/setup_relations.cpp:78
-msgid "Enemy"
-msgstr ""
-
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:195
 msgid "Allow trading"
 msgstr "允許交易"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/widgets/tabs/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:198
 msgid "Allow whispers"
 msgstr "允許密語"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:205
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:289
+#: src/gui/widgets/tabs/setup_relations.cpp:230
 msgid "When ignoring:"
 msgstr "當忽略時："
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:63
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:65
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:67
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:69
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:71
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:73
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:96
+#: src/gui/widgets/tabs/setup_theme.cpp:75
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:98
+#: src/gui/widgets/tabs/setup_theme.cpp:77
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:100
+#: src/gui/widgets/tabs/setup_theme.cpp:79
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:102
+#: src/gui/widgets/tabs/setup_theme.cpp:81
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:104
+#: src/gui/widgets/tabs/setup_theme.cpp:83
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:106
+#: src/gui/widgets/tabs/setup_theme.cpp:85
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:108
+#: src/gui/widgets/tabs/setup_theme.cpp:87
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:110
+#: src/gui/widgets/tabs/setup_theme.cpp:89
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:112
+#: src/gui/widgets/tabs/setup_theme.cpp:91
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:114
+#: src/gui/widgets/tabs/setup_theme.cpp:93
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:128
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:130
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:132
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:134
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:136
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:138
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:161
+#: src/gui/widgets/tabs/setup_theme.cpp:140
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:163
+#: src/gui/widgets/tabs/setup_theme.cpp:142
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:165
+#: src/gui/widgets/tabs/setup_theme.cpp:144
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:167
+#: src/gui/widgets/tabs/setup_theme.cpp:146
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:169
+#: src/gui/widgets/tabs/setup_theme.cpp:148
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:171
+#: src/gui/widgets/tabs/setup_theme.cpp:150
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:173
+#: src/gui/widgets/tabs/setup_theme.cpp:152
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:175
+#: src/gui/widgets/tabs/setup_theme.cpp:154
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:177
+#: src/gui/widgets/tabs/setup_theme.cpp:156
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:179
+#: src/gui/widgets/tabs/setup_theme.cpp:158
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:210
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:238
+#: src/gui/widgets/tabs/setup_theme.cpp:217
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:222
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
 #. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:247 src/gui/windows/emotewindow.cpp:44
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:230
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:255
+#: src/gui/widgets/tabs/setup_theme.cpp:234
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:259
+#: src/gui/widgets/tabs/setup_theme.cpp:238
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:263
+#: src/gui/widgets/tabs/setup_theme.cpp:242
 msgid "Npc font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:246
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:271
+#: src/gui/widgets/tabs/setup_theme.cpp:250
 msgid "Chinese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:255
 msgid "Font size"
 msgstr "字型大小"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:281
+#: src/gui/widgets/tabs/setup_theme.cpp:260
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:285
+#: src/gui/widgets/tabs/setup_theme.cpp:264
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:424
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Name: "
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_theme.cpp:425
+#: src/gui/widgets/tabs/setup_theme.cpp:404
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:490
+#: src/gui/widgets/tabs/setup_theme.cpp:469
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:517
+#: src/gui/widgets/tabs/setup_theme.cpp:496
 #: src/gui/widgets/tabs/setup_video.cpp:499
 #: src/gui/widgets/tabs/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#. TRANSLATORS: update type
-#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:40
+#: src/gui/widgets/tabs/setup_touch.cpp:44
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/widgets/tabs/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:46
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/widgets/tabs/setup_touch.cpp:63
+#: src/gui/widgets/tabs/setup_touch.cpp:67
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:76
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:75
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:79
+#: src/gui/widgets/tabs/setup_touch.cpp:83
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:89
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:88
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:92
+#: src/gui/widgets/tabs/setup_touch.cpp:96
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:101
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:100
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:104
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:108
+#: src/gui/widgets/tabs/setup_touch.cpp:112
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_touch.cpp:116
+#: src/gui/widgets/tabs/setup_touch.cpp:120
 #, c-format
 msgid "Button %u action"
 msgstr ""
@@ -4520,323 +4624,314 @@ msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:40
 msgid "No text"
 msgstr "沒有文字"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:42
 msgid "Text"
 msgstr "文字"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:44
 msgid "Bubbles, no names"
 msgstr "有聊天泡泡,沒名字"
 
 #. TRANSLATORS: speach type
-#: src/gui/widgets/tabs/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:46
 msgid "Bubbles with names"
 msgstr "聊天泡泡加名字"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:53
-#: src/gui/widgets/tabs/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:54
+#: src/gui/widgets/tabs/setup_visual.cpp:80
 msgid "off"
 msgstr "關閉"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:66
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:68
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/widgets/tabs/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:70
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:82
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:94
+#: src/gui/widgets/tabs/setup_visual.cpp:95
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:103
-#: src/gui/widgets/tabs/setup_visual.cpp:111
+#: src/gui/widgets/tabs/setup_visual.cpp:104
+#: src/gui/widgets/tabs/setup_visual.cpp:112
 msgid "Scale"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:115
+#: src/gui/widgets/tabs/setup_visual.cpp:116
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:118
+#: src/gui/widgets/tabs/setup_visual.cpp:119
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:123
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:127
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:130
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:135
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:139
+#: src/gui/widgets/tabs/setup_visual.cpp:140
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:145
 msgid "Overhead text"
 msgstr "置頂文字"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:149
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "Ambient FX"
 msgstr "環境效果"
 
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:164
 msgid "max"
 msgstr "最大"
 
-#: src/gui/widgets/tabs/setup_visual.cpp:164
+#: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:171
+#: src/gui/widgets/tabs/setup_visual.cpp:172
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:176
-#: src/gui/widgets/tabs/setup_visual.cpp:183
+#: src/gui/widgets/tabs/setup_visual.cpp:177
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:180
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:192
+#: src/gui/widgets/tabs/setup_visual.cpp:193
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:197
+#: src/gui/widgets/tabs/setup_visual.cpp:198
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:202
+#: src/gui/widgets/tabs/setup_visual.cpp:203
 msgid "Allow screensaver to run"
 msgstr ""
 
 #. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:68
 msgid "Who is online"
 msgstr ""
 
 #. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:70
 msgid "HLP"
 msgstr ""
 
 #. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:73
 msgid "QE"
 msgstr ""
 
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:124
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
 msgid "Quests"
 msgstr ""
 
 #. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
+#: src/gui/windowmenu.cpp:76
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:77
 msgid "Bot checker"
 msgstr ""
 
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:79
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:82
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:84
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:92
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:93
 msgid "Status"
 msgstr "狀態"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:95
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:228
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "裝備"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:98
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:161
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "物品攔"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:101
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:108
+#: src/gui/windowmenu.cpp:107
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
 msgid "Skills"
 msgstr "技能"
 
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:116
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:117
-msgid "Specials"
-msgstr ""
-
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:122
+#: src/gui/windowmenu.cpp:112
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:126
+#: src/gui/windowmenu.cpp:116
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:130
+#: src/gui/windowmenu.cpp:120
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:124
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:138
+#: src/gui/windowmenu.cpp:128
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:130
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:132
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:136
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:150
+#: src/gui/windowmenu.cpp:140
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:159
+#: src/gui/windowmenu.cpp:149
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:153
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:562
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:561
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -4848,7 +4943,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "重設"
 
@@ -4857,61 +4952,21 @@ msgstr "重設"
 msgid "Result"
 msgstr ""
 
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:57
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:59
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:195
+#: src/gui/windows/buydialog.cpp:162
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
-#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/buydialog.cpp:229
 msgid "Amount:"
 msgstr ""
 
@@ -4921,9 +4976,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "增加"
 
@@ -4933,18 +4988,18 @@ msgstr "增加"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "減少"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charselectdialog.cpp:591
-#: src/gui/windows/socialwindow.cpp:1300
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
 msgid "Create"
 msgstr "創造"
 
@@ -4953,7 +5008,7 @@ msgstr "創造"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
 #: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
 #: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
 msgid "Max"
@@ -5001,7 +5056,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:48
 #: src/gui/windows/changepassworddialog.cpp:54
-#: src/gui/windows/charselectdialog.cpp:97
+#: src/gui/windows/charselectdialog.cpp:99
 msgid "Change Password"
 msgstr "變更密碼"
 
@@ -5010,7 +5065,7 @@ msgstr "變更密碼"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:67
-#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/logindialog.cpp:124 src/gui/windows/registerdialog.cpp:91
 #: src/gui/windows/unregisterdialog.cpp:65
 msgid "Password:"
 msgstr "密碼："
@@ -5043,7 +5098,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:67
 msgid "New Character"
 msgstr ""
 
@@ -5051,9 +5106,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:71
-#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
-#: src/gui/windows/registerdialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/registerdialog.cpp:89
 msgid "Name:"
 msgstr "名字："
 
@@ -5061,11 +5116,11 @@ msgstr "名字："
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:75
-#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:77
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/charcreatedialog.cpp:173
+#: src/gui/windows/charcreatedialog.cpp:183
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5074,134 +5129,134 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:79
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:185
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:88
+#: src/gui/windows/charcreatedialog.cpp:90
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:101
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:103
-#: src/gui/windows/registerdialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:110
 msgid "Male"
 msgstr "男生"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:111
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:112
 msgid "Female"
 msgstr "女生"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:458
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:177
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:187
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:351
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:448
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:464
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:64
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:88
+#: src/gui/windows/charselectdialog.cpp:90
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:95
+#: src/gui/windows/charselectdialog.cpp:97
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:102
-#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:187
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/gui/windows/charselectdialog.cpp:580
+#: src/gui/windows/updaterwindow.cpp:188
 msgid "Play"
 msgstr "開始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:104
-#: src/net/ea/charserverhandler.cpp:216
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Info"
 msgstr "資訊"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/charselectdialog.cpp:133
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "取消註冊"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:145
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:181
+#: src/gui/windows/charselectdialog.cpp:183
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:257
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5211,48 +5266,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/charselectdialog.cpp:299
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:433
+#: src/gui/windows/charselectdialog.cpp:435
 msgid "Enter password:"
 msgstr ""
 
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,12 +5303,12 @@ msgid "Yes"
 msgstr "是"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:73
+#: src/gui/windows/debugwindow.cpp:74
 msgid "Target"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:75
+#: src/gui/windows/debugwindow.cpp:76
 msgid "Net"
 msgstr ""
 
@@ -5498,61 +5538,61 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:65
+#: src/gui/windows/editserverdialog.cpp:45
 msgid "Edit Server"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:74
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
 msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:90
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:92
+#: src/gui/windows/editserverdialog.cpp:72
 msgid "Port:"
 msgstr "端口(port):"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:94
+#: src/gui/windows/editserverdialog.cpp:74
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:96
+#: src/gui/windows/editserverdialog.cpp:76
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:98
+#: src/gui/windows/editserverdialog.cpp:78
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:219
+#: src/gui/windows/editserverdialog.cpp:188
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/windows/emotewindow.cpp:42
+#: src/gui/windows/emotewindow.cpp:43
 msgid "Normal font"
 msgstr ""
 
 #. TRANSLATORS: emotes tab name
-#: src/gui/windows/emotewindow.cpp:111
+#: src/gui/windows/emotewindow.cpp:112
 msgid "Fonts"
 msgstr ""
 
@@ -5562,47 +5602,47 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:211
+#: src/gui/windows/itemamountwindow.cpp:164
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:220
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:224
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:228
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:232
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:236
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:240
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:244
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:248
 msgid "Unknown."
 msgstr ""
 
@@ -5711,62 +5751,52 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:81
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/windows/logindialog.cpp:83
-msgid "Skip"
-msgstr ""
-
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/logindialog.cpp:100
 msgid "Login"
 msgstr "登入"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:152
+#: src/gui/windows/logindialog.cpp:90
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:155
+#: src/gui/windows/logindialog.cpp:93
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:160
+#: src/gui/windows/logindialog.cpp:98
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:102 src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Register"
 msgstr "註冊"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:166
+#: src/gui/windows/logindialog.cpp:104
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:180
+#: src/gui/windows/logindialog.cpp:118
 msgid "Server:"
 msgstr "伺服器："
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:190
+#: src/gui/windows/logindialog.cpp:128
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:305
+#: src/gui/windows/logindialog.cpp:243
 msgid "Open register url"
 msgstr ""
 
@@ -5843,17 +5873,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "下一個"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "確認"
 
@@ -5862,9 +5892,9 @@ msgstr "確認"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
-#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
+#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
+#: src/gui/windows/tradewindow.cpp:78
 msgid "Add"
 msgstr "增加"
 
@@ -5884,7 +5914,7 @@ msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳送的發件人或信息無效。"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:555
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
@@ -5900,40 +5930,40 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:61
+#: src/gui/windows/quitdialog.cpp:62
 msgid "Switch server"
 msgstr "交換伺服器"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:64
+#: src/gui/windows/quitdialog.cpp:65
 msgid "Switch character"
 msgstr "交換角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:92
+#: src/gui/windows/registerdialog.cpp:93
 msgid "Confirm:"
 msgstr "確認："
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:133
 msgid "Email:"
 msgstr "電子郵件"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:205
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:214
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/registerdialog.cpp:223
 #: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -5941,128 +5971,128 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:232
 #: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:239
+#: src/gui/windows/registerdialog.cpp:240
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:245
+#: src/gui/windows/selldialog.cpp:246
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:247
+#: src/gui/windows/selldialog.cpp:248
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:90
+#: src/gui/windows/setupwindow.cpp:92
 msgid "Apply"
 msgstr "確定"
 
 #. TRANSLATORS: setup button
-#: src/gui/windows/setupwindow.cpp:96
+#: src/gui/windows/setupwindow.cpp:98
 msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:74
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:88
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:90
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:96 src/gui/windows/shopwindow.cpp:103
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:107
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/shopwindow.cpp:167 src/gui/windows/shopwindow.cpp:170
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
+#: src/gui/windows/shopwindow.cpp:784 src/net/ea/tradehandler.cpp:106
 msgid "Request for Trade"
 msgstr "要求交易"
 
-#: src/gui/windows/shopwindow.cpp:783
+#: src/gui/windows/shopwindow.cpp:784
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6091,277 +6121,277 @@ msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:222
+#: src/gui/windows/socialwindow.cpp:227
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:237
+#: src/gui/windows/socialwindow.cpp:242
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:251
+#: src/gui/windows/socialwindow.cpp:256
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:253
+#: src/gui/windows/socialwindow.cpp:258
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:263
+#: src/gui/windows/socialwindow.cpp:268
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:265
+#: src/gui/windows/socialwindow.cpp:270
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:276
+#: src/gui/windows/socialwindow.cpp:281
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
-#: src/gui/windows/socialwindow.cpp:493
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "隊伍"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:424
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:439
+#: src/gui/windows/socialwindow.cpp:446
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:453
+#: src/gui/windows/socialwindow.cpp:460
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:455
+#: src/gui/windows/socialwindow.cpp:462
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:465
+#: src/gui/windows/socialwindow.cpp:472
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:467
+#: src/gui/windows/socialwindow.cpp:474
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:692
+#: src/gui/windows/socialwindow.cpp:665
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:719
+#: src/gui/windows/socialwindow.cpp:692
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:821
+#: src/gui/windows/socialwindow.cpp:794
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1048
+#: src/gui/windows/socialwindow.cpp:1021
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1067
+#: src/gui/windows/socialwindow.cpp:1040
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1069
+#: src/gui/windows/socialwindow.cpp:1042
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1071
+#: src/gui/windows/socialwindow.cpp:1044
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1095
+#: src/gui/windows/socialwindow.cpp:1068
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1114
+#: src/gui/windows/socialwindow.cpp:1087
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1116
+#: src/gui/windows/socialwindow.cpp:1089
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/socialwindow.cpp:1179
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1720
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1291
+#: src/gui/windows/socialwindow.cpp:1265
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1296
+#: src/gui/windows/socialwindow.cpp:1270
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1302
+#: src/gui/windows/socialwindow.cpp:1276
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1496
+#: src/gui/windows/socialwindow.cpp:1470
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1507
+#: src/gui/windows/socialwindow.cpp:1481
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1524
+#: src/gui/windows/socialwindow.cpp:1498
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1538
+#: src/gui/windows/socialwindow.cpp:1512
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1578
+#: src/gui/windows/socialwindow.cpp:1552
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1599
+#: src/gui/windows/socialwindow.cpp:1573
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1614
+#: src/gui/windows/socialwindow.cpp:1588
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1590
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1632
+#: src/gui/windows/socialwindow.cpp:1606
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1640
+#: src/gui/windows/socialwindow.cpp:1614
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1621
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1663
+#: src/gui/windows/socialwindow.cpp:1637
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1675
+#: src/gui/windows/socialwindow.cpp:1649
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1654
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1689
+#: src/gui/windows/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1669
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1705
+#: src/gui/windows/socialwindow.cpp:1679
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/windows/socialwindow.cpp:1721
+#: src/gui/windows/socialwindow.cpp:1695
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1701
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1729
+#: src/gui/windows/socialwindow.cpp:1703
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6403,149 +6433,104 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:99
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:109
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Astral Magic"
-msgstr ""
-
 #. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:52
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:54
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:59
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:62
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:66
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:70
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:73
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:76
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:80
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:83
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:88
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:58
 msgid "Propose trade"
 msgstr "是否交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:60
 msgid "Confirmed. Waiting..."
 msgstr "已確認。請稍候..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "同意交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "已同意。請稍候..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:68
 msgid "Trade: You"
 msgstr "交易：您"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:81
 msgid "Change"
 msgstr "更改"
 
@@ -6555,12 +6540,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -6572,36 +6557,36 @@ msgid "Name: %s"
 msgstr "名字：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:158
+#: src/gui/windows/updaterwindow.cpp:159
 msgid "Updating..."
 msgstr "更新中..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:183
+#: src/gui/windows/updaterwindow.cpp:184
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/windows/updaterwindow.cpp:369
+#: src/gui/windows/updaterwindow.cpp:370
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:757
+#: src/gui/windows/updaterwindow.cpp:758
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:759
+#: src/gui/windows/updaterwindow.cpp:760
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:761
+#: src/gui/windows/updaterwindow.cpp:762
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:939
+#: src/gui/windows/updaterwindow.cpp:940
 msgid "Completed"
 msgstr "已完成"
 
@@ -6631,42 +6616,42 @@ msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:49
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:55
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:57
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6674,7 +6659,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -6809,163 +6794,163 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:72
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:74
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:76
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:78
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:80
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:82
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:128
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:186
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:190
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:194
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:198
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:216
+#: src/net/ea/charserverhandler.cpp:217
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:226
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:107
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:116
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamehandler.cpp:85
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:183
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:198
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:201
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:199
+#: src/net/ea/guildhandler.cpp:203
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:202
+#: src/net/ea/guildhandler.cpp:206
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7017,58 +7002,58 @@ msgid "Experience sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:153
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:160
+#: src/net/ea/loginhandler.cpp:157
 msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:164 src/net/ea/loginhandler.cpp:291
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237
+#: src/net/ea/loginhandler.cpp:234
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:238
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:243
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250
+#: src/net/ea/loginhandler.cpp:247
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254
+#: src/net/ea/loginhandler.cpp:251
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:256
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263
+#: src/net/ea/loginhandler.cpp:260
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7076,22 +7061,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:268
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275
+#: src/net/ea/loginhandler.cpp:272
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283
+#: src/net/ea/loginhandler.cpp:280
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287
+#: src/net/ea/loginhandler.cpp:284
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7111,290 +7096,290 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
-#: src/net/ea/playerhandler.cpp:396
+#: src/net/ea/playerhandler.cpp:301 src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:397
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:302
+#: src/net/ea/playerhandler.cpp:303
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:314
+#: src/net/ea/playerhandler.cpp:315
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/skillhandler.cpp:153
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:157
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:161
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:165
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:169
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:185
+#: src/net/ea/skillhandler.cpp:187
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:191
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:195
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:199
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:203
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:207
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:211
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:214
+#: src/net/ea/skillhandler.cpp:216
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:220
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:224
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:228
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:238
+#: src/net/ea/skillhandler.cpp:240
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:244
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:248
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:95 src/net/tmwa/generalhandler.cpp:100
+#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:96 src/net/tmwa/generalhandler.cpp:102
+#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:97 src/net/tmwa/generalhandler.cpp:104
+#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:98 src/net/tmwa/generalhandler.cpp:106
+#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:99 src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:100 src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:101 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:137
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:140
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:153
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:140 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:158
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:162
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:166
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:219 src/net/tmwa/generalhandler.cpp:248
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:276
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:244 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:278
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:280
 msgid "Vitality"
 msgstr "體力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:246 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:282
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:284
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:248 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:286
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:291
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:293
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:295
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:298
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:301
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:304
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:305
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:306
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:308
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:310
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:312
 msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:107
+#: src/net/ea/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是否接受?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:155
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
@@ -7764,7 +7749,7 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
 #: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知物品"
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29e5afcb0..054ab4823 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,7 +47,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
     SET(EXTRA_LIBRARIES rt)
 ENDIF()
 
-SET(FLAGS "${FLAGS} -DUSE_MUMBLE -DUSE_INTERNALGUICHAN")
+SET(FLAGS "${FLAGS} -DUSE_MUMBLE")
 
 IF (WITH_OPENGL)
     FIND_PACKAGE(OpenGL REQUIRED)
@@ -62,7 +62,6 @@ IF (USE_X11)
 ENDIF (USE_X11)
 
 INCLUDE_DIRECTORIES(
-    "guichan/include"
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${SDL_INCLUDE_DIR}
     ${SDLIMAGE_INCLUDE_DIR}
@@ -108,6 +107,9 @@ MARK_AS_ADVANCED(SDL_LIBRARY)
 SET(SRCS
     gui/widgets/avatarlistbox.cpp
     gui/widgets/avatarlistbox.h
+    gui/models/avatarlistmodel.h
+    gui/models/beingslistmodel.h
+    gui/models/colorlistmodel.h
     gui/widgets/tabs/battletab.cpp
     gui/widgets/tabs/battletab.h
     gui/widgets/browserbox.cpp
@@ -125,8 +127,8 @@ SET(SRCS
     gui/widgets/tabs/chattab.h
     gui/widgets/checkbox.cpp
     gui/widgets/checkbox.h
-    gui/widgets/colormodel.cpp
-    gui/widgets/colormodel.h
+    gui/models/colormodel.cpp
+    gui/models/colormodel.h
     gui/widgets/colorpage.cpp
     gui/widgets/colorpage.h
     gui/widgets/container.cpp
@@ -139,9 +141,13 @@ SET(SRCS
     gui/widgets/emoteshortcutcontainer.h
     gui/widgets/extendedlistbox.cpp
     gui/widgets/extendedlistbox.h
-    gui/widgets/extendedlistmodel.h
-    gui/widgets/extendednamesmodel.cpp
-    gui/widgets/extendednamesmodel.h
+    gui/models/extendedlistmodel.h
+    gui/models/extendednamesmodel.cpp
+    gui/models/extendednamesmodel.h
+    gui/models/fontsmodel.h
+    gui/models/iconsmodel.h
+    gui/models/ignorechoiceslistmodel.h
+    gui/models/itemsmodel.h
     gui/widgets/flowcontainer.cpp
     gui/widgets/flowcontainer.h
     gui/widgets/tabs/gmtab.cpp
@@ -177,9 +183,11 @@ SET(SRCS
     gui/widgets/linkhandler.h
     gui/widgets/listbox.cpp
     gui/widgets/listbox.h
-    gui/widgets/mouseevent.h
-    gui/widgets/namesmodel.cpp
-    gui/widgets/namesmodel.h
+    gui/models/namesmodel.cpp
+    gui/models/namesmodel.h
+    gui/models/playerrelationlistmodel.h
+    gui/models/questsmodel.h
+    gui/models/serverslistmodel.h
     gui/widgets/passwordfield.cpp
     gui/widgets/passwordfield.h
     gui/widgets/playerbox.cpp
@@ -206,8 +214,8 @@ SET(SRCS
     gui/widgets/tabs/setuptabscroll.h
     gui/widgets/setuptouchitem.cpp
     gui/widgets/setuptouchitem.h
-    gui/widgets/shopitems.cpp
-    gui/widgets/shopitems.h
+    gui/models/shopitems.cpp
+    gui/models/shopitems.h
     gui/widgets/shoplistbox.cpp
     gui/widgets/shoplistbox.h
     gui/widgets/shortcutcontainer.cpp
@@ -216,8 +224,11 @@ SET(SRCS
     gui/widgets/skilldata.h
     gui/widgets/skillinfo.cpp
     gui/widgets/skillinfo.h
-    gui/widgets/skillmodel.cpp
-    gui/widgets/skillmodel.h
+    gui/models/skillmodel.cpp
+    gui/models/skillmodel.h
+    gui/models/sortlistmodelbuy.h
+    gui/models/sortlistmodelinv.h
+    gui/models/soundsmodel.h
     gui/widgets/slider.cpp
     gui/widgets/slider.h
     gui/widgets/sliderlist.cpp
@@ -228,8 +239,16 @@ SET(SRCS
     gui/widgets/tabbedarea.h
     gui/widgets/guitable.cpp
     gui/widgets/guitable.h
-    gui/widgets/tablemodel.cpp
-    gui/widgets/tablemodel.h
+    gui/models/tablemodel.cpp
+    gui/models/tablemodel.h
+    gui/models/targettypemodel.h
+    gui/models/touchactionmodel.cpp
+    gui/models/touchactionmodel.h
+    gui/models/typelistmodel.h
+    gui/models/updatetypemodel.h
+    gui/models/updatelistmodel.h
+    gui/models/worldlistmodel.h
+    gui/models/themesmodel.h
     gui/widgets/tabstrip.cpp
     gui/widgets/tabstrip.h
     gui/widgets/textbox.cpp
@@ -366,8 +385,8 @@ SET(SRCS
     gui/widgets/tabs/setup_visual.cpp
     gui/widgets/tabs/setup_visual.h
     gui/setupactiondata.h
-    gui/sdlfont.cpp
-    gui/sdlfont.h
+    gui/font.cpp
+    gui/font.h
     gui/windows/shopwindow.cpp
     gui/windows/shopwindow.h
     gui/windows/shortcutwindow.cpp
@@ -506,6 +525,8 @@ SET(SRCS
     resources/sdlmusic.h
     resources/db/sounddb.cpp
     resources/db/sounddb.h
+    resources/db/weaponsdb.cpp
+    resources/db/weaponsdb.h
     resources/soundeffect.cpp
     resources/soundeffect.h
     resources/soundinfo.h
@@ -568,6 +589,8 @@ SET(SRCS
     utils/mkdir.h
     utils/xml.cpp
     utils/xml.h
+    utils/xmlutils.cpp
+    utils/xmlutils.h
     test/testlauncher.cpp
     test/testlauncher.h
     test/testmain.cpp
@@ -578,7 +601,7 @@ SET(SRCS
     being/actor.h
     being/actorsprite.cpp
     being/actorsprite.h
-    being/actorspritelistener.h
+    listeners/actorspritelistener.h
     actormanager.cpp
     actormanager.h
     animatedsprite.cpp
@@ -608,7 +631,7 @@ SET(SRCS
     commands.h
     being/compoundsprite.cpp
     being/compoundsprite.h
-    configlistener.h
+    listeners/configlistener.h
     configuration.cpp
     configuration.h
     debug.h
@@ -616,8 +639,8 @@ SET(SRCS
     defaults.h
     depricatedevent.cpp
     depricatedevent.h
-    depricatedlistener.cpp
-    depricatedlistener.h
+    listeners/depricatedlistener.cpp
+    listeners/depricatedlistener.h
     dragdrop.h
     effectmanager.cpp
     effectmanager.h
@@ -660,17 +683,13 @@ SET(SRCS
     textcommand.h
     input/inputmanager.cpp
     input/inputmanager.h
-    input/inputevent.cpp
-    input/inputevent.h
+    events/inputevent.h
     input/joystick.cpp
     input/joystick.h
     input/keyboardconfig.cpp
     input/keyboardconfig.h
     input/keyboarddata.h
     input/keydata.h
-    input/keyevent.cpp
-    input/keyevent.h
-    input/keyinput.cpp
     input/keyinput.h
     input/multitouchmanager.cpp
     input/multitouchmanager.h
@@ -691,8 +710,7 @@ SET(SRCS
     render/mgl.h
     render/mobileopenglgraphics.cpp
     render/mobileopenglgraphics.h
-    mouseinput.cpp
-    mouseinput.h
+    input/mouseinput.h
     mumblemanager.cpp
     mumblemanager.h
     navigationmanager.cpp
@@ -725,7 +743,7 @@ SET(SRCS
     being/playerinfo.h
     being/playerrelations.cpp
     being/playerrelations.h
-    being/playerrelationslistener.h
+    listeners/playerrelationslistener.h
     position.cpp
     position.h
     properties.h
@@ -770,81 +788,56 @@ SET(SRCS
     vector.h
     walklayer.cpp
     walklayer.h
-    )
-
-SET(SRCS_GUICHAN
-    guichan/include/guichan/actionevent.hpp
-    guichan/include/guichan/actionlistener.hpp
-    guichan/include/guichan/basiccontainer.hpp
-    guichan/include/guichan/cliprectangle.hpp
-    guichan/include/guichan/color.hpp
-    guichan/include/guichan/deathlistener.hpp
-    guichan/include/guichan/event.hpp
-    guichan/include/guichan/exception.hpp
-    guichan/include/guichan/focushandler.hpp
-    guichan/include/guichan/focuslistener.hpp
-    guichan/include/guichan/font.hpp
-    guichan/include/guichan/graphics.hpp
-    guichan/include/guichan/gui.hpp
-    guichan/include/guichan/image.hpp
-    guichan/include/guichan/input.hpp
-    guichan/include/guichan/inputevent.hpp
-    guichan/include/guichan/key.hpp
-    guichan/include/guichan/keyevent.hpp
-    guichan/include/guichan/keyinput.hpp
-    guichan/include/guichan/keylistener.hpp
-    guichan/include/guichan/listmodel.hpp
-    guichan/include/guichan/mouseevent.hpp
-    guichan/include/guichan/mouseinput.hpp
-    guichan/include/guichan/mouselistener.hpp
-    guichan/include/guichan/rectangle.hpp
-    guichan/include/guichan/selectionevent.hpp
-    guichan/include/guichan/selectionlistener.hpp
-    guichan/include/guichan/sdl/sdlpixel.hpp
-    guichan/include/guichan/widget.hpp
-    guichan/include/guichan/widgetlistener.hpp
-    guichan/include/guichan/widgets/button.hpp
-    guichan/include/guichan/widgets/checkbox.hpp
-    guichan/include/guichan/widgets/container.hpp
-    guichan/include/guichan/widgets/label.hpp
-    guichan/include/guichan/widgets/listbox.hpp
-    guichan/include/guichan/widgets/radiobutton.hpp
-    guichan/include/guichan/widgets/scrollarea.hpp
-    guichan/include/guichan/widgets/slider.hpp
-    guichan/include/guichan/widgets/textbox.hpp
-    guichan/include/guichan/widgets/textfield.hpp
-    guichan/include/guichan/widgets/window.hpp
-    guichan/actionevent.cpp
-    guichan/basiccontainer.cpp
-    guichan/cliprectangle.cpp
-    guichan/color.cpp
-    guichan/event.cpp
-    guichan/exception.cpp
-    guichan/focushandler.cpp
-    guichan/font.cpp
-    guichan/graphics.cpp
-    guichan/gui.cpp
-    guichan/image.cpp
-    guichan/inputevent.cpp
-    guichan/key.cpp
-    guichan/keyevent.cpp
-    guichan/keyinput.cpp
-    guichan/mouseevent.cpp
-    guichan/mouseinput.cpp
-    guichan/rectangle.cpp
-    guichan/selectionevent.cpp
-    guichan/widget.cpp
-    guichan/widgets/button.cpp
-    guichan/widgets/checkbox.cpp
-    guichan/widgets/container.cpp
-    guichan/widgets/label.cpp
-    guichan/widgets/listbox.cpp
-    guichan/widgets/radiobutton.cpp
-    guichan/widgets/scrollarea.cpp
-    guichan/widgets/slider.cpp
-    guichan/widgets/textbox.cpp
-    guichan/widgets/textfield.cpp
-    guichan/widgets/window.cpp
+    events/actionevent.h
+    listeners/actionlistener.h
+    gui/base/basiccontainer.hpp
+    gui/cliprect.h
+    gui/color.h
+    listeners/deathlistener.h
+    events/event.h
+    listeners/focuslistener.h
+    gui/base/gui.hpp
+    events/inputguievent.h
+    input/key.h
+    events/keyevent.h
+    listeners/keylistener.h
+    gui/models/listmodel.h
+    gui/models/magicschoolmodel.h
+    events/mouseevent.h
+    listeners/mouselistener.h
+    gui/rect.h
+    events/selectionevent.h
+    listeners/selectionlistener.h
+    utils/sdlpixel.h
+    gui/widgets/widget.h
+    listeners/widgetlistener.h
+    gui/base/widgets/button.hpp
+    gui/base/widgets/checkbox.hpp
+    gui/base/widgets/container.hpp
+    gui/base/widgets/label.hpp
+    gui/base/widgets/listbox.hpp
+    gui/base/widgets/radiobutton.hpp
+    gui/base/widgets/scrollarea.hpp
+    gui/base/widgets/slider.hpp
+    gui/base/widgets/textbox.hpp
+    gui/base/widgets/textfield.hpp
+    gui/base/basiccontainer.cpp
+    gui/cliprect.cpp
+    gui/color.cpp
+    gui/base/gui.cpp
+    input/key.cpp
+    gui/rect.cpp
+    gui/widgets/widget.cpp
+    gui/base/widgets/button.cpp
+    gui/base/widgets/checkbox.cpp
+    gui/base/widgets/container.cpp
+    gui/base/widgets/label.cpp
+    gui/base/widgets/listbox.cpp
+    gui/base/widgets/radiobutton.cpp
+    gui/base/widgets/scrollarea.cpp
+    gui/base/widgets/slider.cpp
+    gui/base/widgets/textbox.cpp
+    gui/base/widgets/textfield.cpp
     )
 
 SET(SRCS_EVOL
@@ -1000,9 +993,9 @@ ENDIF ()
 SET (PROGRAMS manaplus)
 
 IF (ENABLE_EATHENA)
-    ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_EVOL})
+    ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_EVOL})
 ELSE(ENABLE_EATHENA)
-    ADD_EXECUTABLE(manaplus WIN32 ${SRCS_GUICHAN} ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL})
+    ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_TMWA} ${SRCS_EVOL})
 ENDIF(ENABLE_EATHENA)
 
 TARGET_LINK_LIBRARIES(manaplus
diff --git a/src/Makefile.am b/src/Makefile.am
index 7fb4541a1..2b1eb4c68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,30 +25,15 @@ else
 manaplus_SOURCES =
 endif
 
-if USE_INTERNALGUICHAN
-dyecmd_CXXFLAGS = -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN
-dyecmd_SOURCES = guichan/actionevent.cpp \
-	      guichan/cliprectangle.cpp \
-	      guichan/color.cpp \
-	      guichan/event.cpp \
-	      guichan/exception.cpp \
-	      guichan/font.cpp \
-	      guichan/graphics.cpp \
-	      guichan/rectangle.cpp \
-	      guichan/widget.cpp \
-	      guichan/include/guichan/actionevent.hpp \
-	      guichan/include/guichan/cliprectangle.hpp \
-	      guichan/include/guichan/color.hpp \
-	      guichan/include/guichan/event.hpp \
-	      guichan/include/guichan/exception.hpp \
-	      guichan/include/guichan/font.hpp \
-	      guichan/include/guichan/graphics.hpp \
-	      guichan/include/guichan/rectangle.hpp \
-	      guichan/include/guichan/widget.hpp
-else
 dyecmd_CXXFLAGS =
-dyecmd_SOURCES =
-endif
+dyecmd_SOURCES = gui/cliprect.cpp \
+	      gui/color.cpp \
+	      gui/rect.cpp \
+	      events/actionevent.h \
+	      gui/cliprect.h \
+	      gui/color.h \
+	      events/event.h \
+	      gui/rect.h
 
 dyecmd_SOURCES += dyetool/dyemain.cpp \
 	      animatedsprite.cpp \
@@ -133,6 +118,8 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
 	      utils/timer.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
+	      utils/xmlutils.cpp \
+	      utils/xmlutils.h \
 	      utils/translation/podict.cpp \
 	      utils/translation/podict.h
 
@@ -163,85 +150,63 @@ manaplus_CXXFLAGS += -DUSE_SDL2
 endif
 endif
 
-if USE_INTERNALGUICHAN
-manaplus_CXXFLAGS += -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN
-manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
-	      guichan/include/guichan/actionlistener.hpp \
-	      guichan/include/guichan/basiccontainer.hpp \
-	      guichan/include/guichan/cliprectangle.hpp \
-	      guichan/include/guichan/color.hpp \
-	      guichan/include/guichan/deathlistener.hpp \
-	      guichan/include/guichan/event.hpp \
-	      guichan/include/guichan/exception.hpp \
-	      guichan/include/guichan/focushandler.hpp \
-	      guichan/include/guichan/focuslistener.hpp \
-	      guichan/include/guichan/font.hpp \
-	      guichan/include/guichan/graphics.hpp \
-	      guichan/include/guichan/gui.hpp \
-	      guichan/include/guichan/image.hpp \
-	      guichan/include/guichan/input.hpp \
-	      guichan/include/guichan/inputevent.hpp \
-	      guichan/include/guichan/key.hpp \
-	      guichan/include/guichan/keyevent.hpp \
-	      guichan/include/guichan/keyinput.hpp \
-	      guichan/include/guichan/keylistener.hpp \
-	      guichan/include/guichan/listmodel.hpp \
-	      guichan/include/guichan/mouseevent.hpp \
-	      guichan/include/guichan/mouseinput.hpp \
-	      guichan/include/guichan/mouselistener.hpp \
-	      guichan/include/guichan/rectangle.hpp \
-	      guichan/include/guichan/selectionevent.hpp \
-	      guichan/include/guichan/selectionlistener.hpp \
-	      guichan/include/guichan/sdl/sdlpixel.hpp \
-	      guichan/include/guichan/widget.hpp \
-	      guichan/include/guichan/widgetlistener.hpp \
-	      guichan/include/guichan/widgets/button.hpp \
-	      guichan/include/guichan/widgets/checkbox.hpp \
-	      guichan/include/guichan/widgets/container.hpp \
-	      guichan/include/guichan/widgets/label.hpp \
-	      guichan/include/guichan/widgets/listbox.hpp \
-	      guichan/include/guichan/widgets/radiobutton.hpp \
-	      guichan/include/guichan/widgets/scrollarea.hpp \
-	      guichan/include/guichan/widgets/slider.hpp \
-	      guichan/include/guichan/widgets/textbox.hpp \
-	      guichan/include/guichan/widgets/textfield.hpp \
-	      guichan/include/guichan/widgets/window.hpp
-
-manaplus_SOURCES += guichan/actionevent.cpp \
-	      guichan/basiccontainer.cpp \
-	      guichan/cliprectangle.cpp \
-	      guichan/color.cpp \
-	      guichan/event.cpp \
-	      guichan/exception.cpp \
-	      guichan/focushandler.cpp \
-	      guichan/font.cpp \
-	      guichan/graphics.cpp \
-	      guichan/gui.cpp \
-	      guichan/image.cpp \
-	      guichan/inputevent.cpp \
-	      guichan/key.cpp \
-	      guichan/keyevent.cpp \
-	      guichan/keyinput.cpp \
-	      guichan/mouseevent.cpp \
-	      guichan/mouseinput.cpp \
-	      guichan/rectangle.cpp \
-	      guichan/selectionevent.cpp \
-	      guichan/widget.cpp \
-	      guichan/widgets/button.cpp \
-	      guichan/widgets/checkbox.cpp \
-	      guichan/widgets/container.cpp \
-	      guichan/widgets/label.cpp \
-	      guichan/widgets/listbox.cpp \
-	      guichan/widgets/radiobutton.cpp \
-	      guichan/widgets/scrollarea.cpp \
-	      guichan/widgets/slider.cpp \
-	      guichan/widgets/textbox.cpp \
-	      guichan/widgets/textfield.cpp \
-	      guichan/widgets/window.cpp
-endif
+manaplus_SOURCES += events/actionevent.h \
+	      listeners/actionlistener.h \
+	      gui/base/basiccontainer.hpp \
+	      gui/cliprect.h \
+	      gui/color.h \
+	      listeners/deathlistener.h \
+	      events/event.h \
+	      listeners/focuslistener.h \
+	      render/graphics.h \
+	      gui/base/gui.hpp \
+	      events/inputguievent.h \
+	      input/key.h \
+	      events/keyevent.h \
+	      listeners/keylistener.h \
+	      gui/models/listmodel.h \
+	      gui/models/magicschoolmodel.h \
+	      events/mouseevent.h \
+	      listeners/mouselistener.h \
+	      gui/rect.h \
+	      events/selectionevent.h \
+	      listeners/selectionlistener.h \
+	      utils/sdlpixel.h \
+	      gui/widgets/widget.h \
+	      listeners/widgetlistener.h \
+	      gui/base/widgets/button.hpp \
+	      gui/base/widgets/checkbox.hpp \
+	      gui/base/widgets/container.hpp \
+	      gui/base/widgets/label.hpp \
+	      gui/base/widgets/listbox.hpp \
+	      gui/base/widgets/radiobutton.hpp \
+	      gui/base/widgets/scrollarea.hpp \
+	      gui/base/widgets/slider.hpp \
+	      gui/base/widgets/textbox.hpp \
+	      gui/base/widgets/textfield.hpp \
+	      gui/base/basiccontainer.cpp \
+	      gui/cliprect.cpp \
+	      gui/color.cpp \
+	      gui/base/gui.cpp \
+	      input/key.cpp \
+	      gui/rect.cpp \
+	      gui/widgets/widget.cpp \
+	      gui/base/widgets/button.cpp \
+	      gui/base/widgets/checkbox.cpp \
+	      gui/base/widgets/container.cpp \
+	      gui/base/widgets/label.cpp \
+	      gui/base/widgets/listbox.cpp \
+	      gui/base/widgets/radiobutton.cpp \
+	      gui/base/widgets/scrollarea.cpp \
+	      gui/base/widgets/slider.cpp \
+	      gui/base/widgets/textbox.cpp \
+	      gui/base/widgets/textfield.cpp
 
 manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/avatarlistbox.h \
+	      gui/models/avatarlistmodel.h \
+	      gui/models/beingslistmodel.h \
+	      gui/models/colorlistmodel.h \
 	      gui/widgets/tabs/battletab.cpp \
 	      gui/widgets/tabs/battletab.h \
 	      gui/widgets/browserbox.cpp \
@@ -259,8 +224,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/chattab.h \
 	      gui/widgets/checkbox.cpp \
 	      gui/widgets/checkbox.h \
-	      gui/widgets/colormodel.cpp \
-	      gui/widgets/colormodel.h \
+	      gui/models/colormodel.cpp \
+	      gui/models/colormodel.h \
 	      gui/widgets/colorpage.cpp \
 	      gui/widgets/colorpage.h \
 	      gui/widgets/container.cpp \
@@ -273,9 +238,13 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/emoteshortcutcontainer.h \
 	      gui/widgets/extendedlistbox.cpp \
 	      gui/widgets/extendedlistbox.h \
-	      gui/widgets/extendedlistmodel.h \
-	      gui/widgets/extendednamesmodel.cpp \
-	      gui/widgets/extendednamesmodel.h \
+	      gui/models/extendedlistmodel.h \
+	      gui/models/extendednamesmodel.cpp \
+	      gui/models/extendednamesmodel.h \
+	      gui/models/fontsmodel.h \
+	      gui/models/iconsmodel.h \
+	      gui/models/ignorechoiceslistmodel.h \
+	      gui/models/itemsmodel.h \
 	      gui/widgets/flowcontainer.cpp \
 	      gui/widgets/flowcontainer.h \
 	      gui/widgets/tabs/gmtab.cpp \
@@ -313,9 +282,11 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/linkhandler.h \
 	      gui/widgets/listbox.cpp \
 	      gui/widgets/listbox.h \
-	      gui/widgets/mouseevent.h \
-	      gui/widgets/namesmodel.cpp \
-	      gui/widgets/namesmodel.h \
+	      gui/models/namesmodel.cpp \
+	      gui/models/namesmodel.h \
+	      gui/models/playerrelationlistmodel.h \
+	      gui/models/questsmodel.h \
+	      gui/models/serverslistmodel.h \
 	      gui/widgets/passwordfield.cpp \
 	      gui/widgets/passwordfield.h \
 	      gui/widgets/playerbox.cpp \
@@ -342,8 +313,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/setuptabscroll.h \
 	      gui/widgets/setuptouchitem.cpp \
 	      gui/widgets/setuptouchitem.h \
-	      gui/widgets/shopitems.cpp \
-	      gui/widgets/shopitems.h \
+	      gui/models/shopitems.cpp \
+	      gui/models/shopitems.h \
 	      gui/widgets/shoplistbox.cpp \
 	      gui/widgets/shoplistbox.h \
 	      gui/widgets/shortcutcontainer.cpp \
@@ -352,8 +323,11 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/skilldata.h \
 	      gui/widgets/skillinfo.cpp \
 	      gui/widgets/skillinfo.h \
-	      gui/widgets/skillmodel.cpp \
-	      gui/widgets/skillmodel.h \
+	      gui/models/skillmodel.cpp \
+	      gui/models/skillmodel.h \
+	      gui/models/sortlistmodelbuy.h \
+	      gui/models/sortlistmodelinv.h \
+	      gui/models/soundsmodel.h \
 	      gui/widgets/slider.cpp \
 	      gui/widgets/slider.h \
 	      gui/widgets/sliderlist.cpp \
@@ -362,8 +336,16 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/tab.h \
 	      gui/widgets/tabbedarea.cpp \
 	      gui/widgets/tabbedarea.h \
-	      gui/widgets/tablemodel.cpp \
-	      gui/widgets/tablemodel.h \
+	      gui/models/tablemodel.cpp \
+	      gui/models/tablemodel.h \
+	      gui/models/targettypemodel.h \
+	      gui/models/touchactionmodel.cpp \
+	      gui/models/touchactionmodel.h \
+	      gui/models/typelistmodel.h \
+	      gui/models/updatetypemodel.h \
+	      gui/models/updatelistmodel.h \
+	      gui/models/worldlistmodel.h \
+	      gui/models/themesmodel.h \
 	      gui/widgets/tabstrip.cpp \
 	      gui/widgets/tabstrip.h \
 	      gui/widgets/textbox.cpp \
@@ -500,8 +482,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/setup_visual.cpp \
 	      gui/widgets/tabs/setup_visual.h \
 	      gui/setupactiondata.h \
-	      gui/sdlfont.cpp \
-	      gui/sdlfont.h \
+	      gui/font.cpp \
+	      gui/font.h \
 	      gui/windows/shopwindow.cpp \
 	      gui/windows/shopwindow.h \
 	      gui/windows/shortcutwindow.cpp \
@@ -642,6 +624,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/sdlmusic.h \
 	      resources/db/sounddb.cpp \
 	      resources/db/sounddb.h \
+	      resources/db/weaponsdb.cpp \
+	      resources/db/weaponsdb.h \
 	      resources/soundeffect.cpp \
 	      resources/soundeffect.h \
 	      resources/soundinfo.h \
@@ -706,6 +690,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      utils/mutex.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
+	      utils/xmlutils.cpp \
+	      utils/xmlutils.h \
 	      test/testlauncher.cpp \
 	      test/testlauncher.h \
 	      test/testmain.cpp \
@@ -716,7 +702,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      being/actor.h \
 	      being/actorsprite.cpp \
 	      being/actorsprite.h \
-	      being/actorspritelistener.h \
+	      listeners/actorspritelistener.h \
 	      actormanager.cpp \
 	      actormanager.h \
 	      animatedsprite.cpp \
@@ -746,7 +732,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      commands.h \
 	      being/compoundsprite.cpp \
 	      being/compoundsprite.h \
-	      configlistener.h \
+	      listeners/configlistener.h \
 	      configuration.cpp \
 	      configuration.h \
 	      debug.h \
@@ -754,8 +740,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      defaults.h \
 	      depricatedevent.cpp \
 	      depricatedevent.h \
-	      depricatedlistener.cpp \
-	      depricatedlistener.h \
+	      listeners/depricatedlistener.cpp \
+	      listeners/depricatedlistener.h \
 	      dragdrop.h \
 	      dropshortcut.cpp \
 	      dropshortcut.h \
@@ -796,8 +782,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      spellshortcut.h \
 	      textcommand.cpp \
 	      textcommand.h \
-	      input/inputevent.cpp \
-	      input/inputevent.h \
+	      events/inputevent.h \
 	      input/inputmanager.cpp \
 	      input/inputmanager.h \
 	      input/joystick.cpp \
@@ -806,9 +791,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      input/keyboardconfig.h \
 	      input/keyboarddata.h \
 	      input/keydata.h \
-	      input/keyevent.cpp \
-	      input/keyevent.h \
-	      input/keyinput.cpp \
 	      input/keyinput.h \
 	      input/multitouchmanager.cpp \
 	      input/multitouchmanager.h \
@@ -829,8 +811,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      render/mgl.h \
 	      render/mobileopenglgraphics.cpp \
 	      render/mobileopenglgraphics.h \
-	      mouseinput.cpp \
-	      mouseinput.h \
+	      input/mouseinput.h \
 	      navigationmanager.cpp \
 	      navigationmanager.h \
 	      render/normalopenglgraphics.cpp \
@@ -861,7 +842,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      being/playerinfo.h \
 	      being/playerrelations.cpp \
 	      being/playerrelations.h \
-	      being/playerrelationslistener.h \
+	      listeners/playerrelationslistener.h \
 	      position.cpp \
 	      position.h \
 	      properties.h \
@@ -1058,6 +1039,7 @@ manaplus_SOURCES += \
 	      gui/widgets/browserbox_unittest.cc \
 	      utils/files_unittest.cc \
 	      utils/stringutils_unittest.cc \
+	      utils/xmlutils_unittest.cc \
 	      resources/dye_unittest.cc
 endif
 
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 1c7dbce14..b8ea34286 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -31,9 +31,9 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "input/inputevent.h"
 #include "input/inputmanager.h"
 
+#include "gui/gui.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
@@ -44,7 +44,6 @@
 #include "gui/windows/questswindow.h"
 #include "gui/windows/quitdialog.h"
 #include "gui/windows/whoisonline.h"
-
 #include "gui/windows/botcheckerwindow.h"
 #include "gui/windows/buyselldialog.h"
 #include "gui/windows/chatwindow.h"
@@ -219,7 +218,7 @@ impHandler0(mouseClick)
 
     int mouseX, mouseY;
     Gui::getMouseState(&mouseX, &mouseY);
-    guiInput->simulateMouseClick(mouseX, mouseY, gcn::MouseEvent::RIGHT);
+    guiInput->simulateMouseClick(mouseX, mouseY, MouseEvent::RIGHT);
     return true;
 }
 
@@ -234,12 +233,12 @@ impHandler0(ok)
     // Close the config window, cancelling changes if opened
     else if (setupWindow && setupWindow->isWindowVisible())
     {
-        setupWindow->action(gcn::ActionEvent(nullptr, "cancel"));
+        setupWindow->action(ActionEvent(nullptr, "cancel"));
         return true;
     }
     else if (NpcDialog *const dialog = NpcDialog::getActive())
     {
-        dialog->action(gcn::ActionEvent(nullptr, "ok"));
+        dialog->action(ActionEvent(nullptr, "ok"));
         return true;
     }
     return false;
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 9661dc2fe..bc325abe8 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -137,23 +137,10 @@ class SortBeingFunctor final
                 return being1->getDistance() < being2->getDistance();
             }
 
-            int d1, d2;
-#ifdef MANASERV_SUPPORT
-            if (Net::getNetworkType() == ServerInfo::MANASERV)
-            {
-                const Vector &pos1 = being1->getPosition();
-                d1 = abs((static_cast<int>(pos1.x)) - x)
-                    + abs((static_cast<int>(pos1.y)) - y);
-                const Vector &pos2 = being2->getPosition();
-                d2 = abs((static_cast<int>(pos2.x)) - x)
-                    + abs((static_cast<int>(pos2.y)) - y);
-            }
-            else
-#endif
-            {
-                d1 = abs(being1->getTileX() - x) + abs(being1->getTileY() - y);
-                d2 = abs(being2->getTileX() - x) + abs(being2->getTileY() - y);
-            }
+            const int d1 = abs(being1->getTileX() - x)
+                + abs(being1->getTileY() - y);
+            const int d2 = abs(being2->getTileX() - x)
+                + abs(being2->getTileY() - y);
 
             if (d1 != d2)
                 return d1 < d2;
@@ -1269,7 +1256,7 @@ void ActorManager::printAllToChat() const
 }
 
 void ActorManager::printBeingsToChat(const ActorSprites &beings,
-                                     const std::string &header) const
+                                     const std::string &header)
 {
     if (!debugChatTab)
         return;
@@ -1294,7 +1281,7 @@ void ActorManager::printBeingsToChat(const ActorSprites &beings,
 }
 
 void ActorManager::printBeingsToChat(const std::vector<Being*> &beings,
-                                     const std::string &header) const
+                                     const std::string &header)
 {
     if (!debugChatTab)
         return;
diff --git a/src/actormanager.h b/src/actormanager.h
index 17bd696d6..f7e306b2a 100644
--- a/src/actormanager.h
+++ b/src/actormanager.h
@@ -211,11 +211,11 @@ class ActorManager final: public ConfigListener
 
         void printAllToChat() const;
 
-        void printBeingsToChat(const ActorSprites &beings,
-                               const std::string &header) const;
+        static void printBeingsToChat(const ActorSprites &beings,
+                                      const std::string &header);
 
-        void printBeingsToChat(const std::vector<Being*> &beings,
-                               const std::string &header) const;
+        static void printBeingsToChat(const std::vector<Being*> &beings,
+                                      const std::string &header);
 
         void getPlayerNames(StringVect &names,
                             const bool npcNames) const;
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 93f8c6009..97424fbfb 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -294,7 +294,7 @@ void AnimatedSprite::draw(Graphics *const graphics,
     if (image->getAlpha() != mAlpha)
         image->setAlpha(mAlpha);
 
-    graphics->drawImage2(image,
+    graphics->drawImage(image,
         posX + mFrame->offsetX, posY + mFrame->offsetY);
 }
 
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 1426e481e..bbb016525 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -21,15 +21,19 @@
 
 #include "being/actorsprite.h"
 
+#include "animatedsprite.h"
 #include "configuration.h"
 #include "imagesprite.h"
 #include "statuseffect.h"
 
-#include "being/actorspritelistener.h"
 #include "being/localplayer.h"
 
 #include "gui/theme.h"
 
+#include "listeners/actorspritelistener.h"
+
+#include "particle/particle.h"
+
 #include "resources/resourcemanager.h"
 
 #include "utils/checkutils.h"
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index f9876fa79..444232ddd 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -183,14 +183,7 @@ public:
     { return getPixelX() - mapTileSize / 2; }
 
     int getActorY() const
-    {
-#ifdef MANASERV_SUPPORT
-        return getPixelY() + ((Net::getNetworkType() == ServerInfo::MANASERV)
-            ? 15 : mapTileSize);
-#else
-        return getPixelY() - mapTileSize;
-#endif
-    }
+    { return getPixelY() - mapTileSize; }
 
 protected:
     /**
diff --git a/src/being/being.cpp b/src/being/being.cpp
index fef3ca53a..41c3bc40c 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -39,7 +39,8 @@
 #include "particle/particle.h"
 #include "particle/particleinfo.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/popups/speechbubble.h"
 
@@ -370,50 +371,7 @@ void Being::setDestination(const int dstX, const int dstY)
     if (!mMap)
         return;
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-    {
-        setPath(mMap->findPath(mX, mY, dstX, dstY, getWalkMask()));
-        return;
-    }
-
-#ifdef MANASERV_SUPPORT
-    // Don't handle flawed destinations from server...
-    if (dstX == 0 || dstY == 0)
-        return;
-
-    // If the destination is unwalkable, don't bother trying to get there
-    if (!mMap->getWalk(dstX / mapTileSize, dstY / mapTileSize))
-        return;
-
-    Position dest = mMap->checkNodeOffsets(getCollisionRadius(), getWalkMask(),
-                                           dstX, dstY);
-    Path thisPath = mMap->findPixelPath(static_cast<int>(mPos.x),
-        static_cast<int>(mPos.y), dest.x, dest.y,
-        static_cast<int>(getCollisionRadius()),
-        static_cast<unsigned char>(getWalkMask()));
-
-    if (thisPath.empty())
-    {
-        // If there is no path but the destination is on the same walkable tile,
-        // we accept it.
-        if (static_cast<int>(mPos.x) / mapTileSize == dest.x / mapTileSize
-            && static_cast<int>(mPos.y) / mapTileSize == dest.y / mapTileSize)
-        {
-            mDest.x = static_cast<float>(dest.x);
-            mDest.y = static_cast<float>(dest.y);
-        }
-        setPath(Path());
-        return;
-    }
-
-    // The destination is valid, so we set it.
-    mDest.x = static_cast<float>(dest.x);
-    mDest.y = static_cast<float>(dest.y);
-
-    setPath(thisPath);
-#endif
+    setPath(mMap->findPath(mX, mY, dstX, dstY, getWalkMask()));
 }
 
 void Being::clearPath()
@@ -427,12 +385,7 @@ void Being::setPath(const Path &path)
     if (mPath.empty())
         return;
 
-#ifdef MANASERV_SUPPORT
-    if ((Net::getNetworkType() != ServerInfo::MANASERV) &&
-        mAction != MOVE && mAction != DEAD)
-#else
     if (mAction != MOVE && mAction != DEAD)
-#endif
     {
         nextTile();
         mActionTime = tick_time;
@@ -519,7 +472,7 @@ void Being::setSpeech(const std::string &text, const std::string &channel,
 
         mText = new Text(mSpeech,
                          getPixelX(), getPixelY() - getHeight(),
-                         gcn::Graphics::CENTER,
+                         Graphics::CENTER,
                          &userPalette->getColor(UserPalette::PARTICLE),
                          true);
     }
@@ -537,11 +490,11 @@ void Being::takeDamage(Being *const attacker, const int amount,
     if (!userPalette || !attacker)
         return;
 
-    gcn::Font *font = nullptr;
+    Font *font = nullptr;
     // TRANSLATORS: hit or miss message in attacks
     const std::string damage = amount ? toString(amount) : type == FLEE ?
             _("dodge") : _("miss");
-    const gcn::Color *color;
+    const Color *color;
 
     if (gui)
         font = gui->getInfoParticleFont();
@@ -770,13 +723,8 @@ void Being::handleAttack(Being *const victim, const int damage,
     else if (mInfo->getAttack(attackId))
         fireMissile(victim, mInfo->getAttack(attackId)->mMissileParticle);
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-    {
-        reset();
-        mActionTime = tick_time;
-    }
+    reset();
+    mActionTime = tick_time;
 
     if (this != player_node)
     {
@@ -823,13 +771,8 @@ void Being::handleSkill(Being *const victim, const int damage,
     if (data)
         fireMissile(victim, data->particle);
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-    {
-        reset();
-        mActionTime = tick_time;
-    }
+    reset();
+    mActionTime = tick_time;
 
     if (this != player_node)
     {
@@ -1442,157 +1385,68 @@ void Being::logic()
     }
 
     int frameCount = static_cast<int>(getFrameCount());
-#ifdef MANASERV_SUPPORT
-    if ((Net::getNetworkType() == ServerInfo::MANASERV) && (mAction != DEAD))
-    {
-        const Vector dest = (mPath.empty()) ?
-            mDest : Vector(static_cast<float>(mPath.front().x),
-                           static_cast<float>(mPath.front().y));
 
-        // This is a hack that stops NPCs from running off the map...
-        if (mDest.x <= 0 && mDest.y <= 0)
-        {
-            BLOCK_END("Being::logic")
-            return;
-        }
-
-        // The Vector representing the difference between current position
-        // and the next destination path node.
-        Vector dir = dest - mPos;
-
-        const float nominalLength = dir.length();
+    switch (mAction)
+    {
+        case STAND:
+        case SIT:
+        case DEAD:
+        case HURT:
+        case SPAWN:
+        default:
+            break;
 
-        // When we've not reached our destination, move to it.
-        if (nominalLength > 0.0F && !mWalkSpeed.isNull())
+        case MOVE:
         {
-            // The deplacement of a point along a vector is calculated
-            // using the Unit Vector (â) multiplied by the point speed.
-            // â = a / ||a|| (||a|| is the a length.)
-            // Then, diff = (dir/||dir||) * speed.
-            const Vector normalizedDir = dir.normalized();
-            Vector diff(normalizedDir.x * mWalkSpeed.x,
-                        normalizedDir.y * mWalkSpeed.y);
-
-            // Test if we don't miss the destination by a move too far:
-            if (diff.length() > nominalLength)
-            {
-                setPosition(mPos + dir);
-
-                // Also, if the destination is reached, try to get the next
-                // path point, if existing.
-                if (!mPath.empty())
-                    mPath.pop_front();
-            }
-            // Otherwise, go to it using the nominal speed.
-            else
+            if (static_cast<float>(get_elapsed_time(
+                mActionTime)) >= mSpeed)
             {
-                setPosition(mPos + diff);
-            }
-
-            if (mAction != MOVE)
-                setAction(MOVE, 0);
-
-            // Update the player sprite direction.
-            // N.B.: We only change this if the distance is more than one pixel.
-            if (nominalLength > 1.0F)
-            {
-                int direction = 0;
-                const float dx = std::abs(dir.x);
-                float dy = std::abs(dir.y);
-
-                // When not using mouse for the player, we slightly prefer
-                // UP and DOWN position, especially when walking diagonally.
-                if (player_node && this == player_node &&
-                    !player_node->isPathSetByMouse())
-                {
-                    dy = dy + 2;
-                }
-
-                if (dx > dy)
-                     direction |= (dir.x > 0) ? RIGHT : LEFT;
-                else
-                     direction |= (dir.y > 0) ? DOWN : UP;
-
-                setDirection(static_cast<uint8_t>(direction));
+                nextTile();
             }
+            break;
         }
-        else if (!mPath.empty())
-        {
-            // If the current path node has been reached,
-            // remove it and go to the next one.
-            mPath.pop_front();
-        }
-        else if (mAction == MOVE)
-        {
-            setAction(STAND, 0);
-        }
-    }
-    else
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-    {
-        switch (mAction)
-        {
-            case STAND:
-            case SIT:
-            case DEAD:
-            case HURT:
-            case SPAWN:
-            default:
-               break;
 
-            case MOVE:
-            {
-                if (static_cast<float>(get_elapsed_time(
-                    mActionTime)) >= mSpeed)
-                {
-                    nextTile();
-                }
+        case ATTACK:
+        {
+            if (!mActionTime)
                 break;
-            }
 
-            case ATTACK:
+            int curFrame = 0;
+            if (mAttackSpeed)
             {
-                if (!mActionTime)
-                    break;
-
-                int curFrame = 0;
-                if (mAttackSpeed)
-                {
-                    curFrame = (get_elapsed_time(mActionTime) * frameCount)
-                        / mAttackSpeed;
-                }
+                curFrame = (get_elapsed_time(mActionTime) * frameCount)
+                    / mAttackSpeed;
+            }
 
-                if (this == player_node && curFrame >= frameCount)
-                    nextTile();
+            if (this == player_node && curFrame >= frameCount)
+                nextTile();
 
-                break;
-            }
+            break;
         }
+    }
 
-        if (mAction == MOVE)
-        {
-            const int xOffset = getXOffset();
-            const int yOffset = getYOffset();
-            int offset = xOffset;
-            if (!offset)
-                offset = yOffset;
+    if (mAction == MOVE)
+    {
+        const int xOffset = getXOffset();
+        const int yOffset = getYOffset();
+        int offset = xOffset;
+        if (!offset)
+            offset = yOffset;
 
-            mSortOffsetY = (mOldHeight * mapTileSize / 2)
-                + (mOffsetY * mapTileSize / 2)
-                * (mapTileSize - abs(offset)) / mapTileSize;
-            const int yOffset2 = yOffset - mSortOffsetY;
+        mSortOffsetY = (mOldHeight * mapTileSize / 2)
+            + (mOffsetY * mapTileSize / 2)
+            * (mapTileSize - abs(offset)) / mapTileSize;
+        const int yOffset2 = yOffset - mSortOffsetY;
 
-            // Update pixel coordinates
-            setPosition(static_cast<float>(mX * mapTileSize
-                + mapTileSize / 2 + xOffset), static_cast<float>(
-                mY * mapTileSize + mapTileSize + yOffset2));
-        }
-        else
-        {
-            setPosition(static_cast<float>(mX * mapTileSize + mapTileSize / 2),
-                static_cast<float>(mY * mapTileSize + mapTileSize));
-        }
+        // Update pixel coordinates
+        setPosition(static_cast<float>(mX * mapTileSize
+            + mapTileSize / 2 + xOffset), static_cast<float>(
+            mY * mapTileSize + mapTileSize + yOffset2));
+    }
+    else
+    {
+        setPosition(static_cast<float>(mX * mapTileSize + mapTileSize / 2),
+            static_cast<float>(mY * mapTileSize + mapTileSize));
     }
 
     if (mEmotionSprite)
@@ -1847,9 +1701,7 @@ void Being::drawSpeech(const int offsetX, const int offsetY)
         mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() / 2),
             py - getHeight() - (mSpeechBubble->getHeight()));
         mSpeechBubble->setVisible(true);
-#ifdef USE_INTERNALGUICHAN
         mSpeechBubble->requestMoveToBackground();
-#endif
     }
     else if (mSpeechTime > 0 && speech == TEXT_OVERHEAD)
     {
@@ -1858,7 +1710,7 @@ void Being::drawSpeech(const int offsetX, const int offsetY)
         if (!mText && userPalette)
         {
             mText = new Text(mSpeech, getPixelX(), getPixelY() - getHeight(),
-                gcn::Graphics::CENTER, &Theme::getThemeColor(
+                Graphics::CENTER, &Theme::getThemeColor(
                 Theme::BUBBLE_TEXT), true);
         }
     }
@@ -2005,7 +1857,7 @@ void Being::showName()
             displayName.append(", ").append(toString(getDamageTaken()));
     }
 
-    gcn::Font *font = nullptr;
+    Font *font = nullptr;
     if (player_node && player_node->getTarget() == this
         && mType != MONSTER)
     {
@@ -2021,12 +1873,12 @@ void Being::showName()
         mDispName = new FlashText(displayName,
             getPixelX() + mInfo->getNameOffsetX(),
             getPixelY() + mInfo->getNameOffsetY(),
-            gcn::Graphics::CENTER, mNameColor, font);
+            Graphics::CENTER, mNameColor, font);
     }
     else
     {
         mDispName = new FlashText(displayName, getPixelX(), getPixelY(),
-            gcn::Graphics::CENTER, mNameColor, font);
+            Graphics::CENTER, mNameColor, font);
     }
 
     updateCoords();
@@ -2516,12 +2368,12 @@ void Being::drawSpriteAt(Graphics *const graphics,
         graphics->setColor(userPalette->
                 getColorWithAlpha(UserPalette::PORTAL_HIGHLIGHT));
 
-        graphics->fillRectangle(gcn::Rectangle(x, y,
+        graphics->fillRectangle(Rect(x, y,
             mapTileSize, mapTileSize));
 
         if (mDrawHotKeys && !mName.empty())
         {
-            gcn::Font *const font = gui->getFont();
+            Font *const font = gui->getFont();
             if (font)
             {
                 graphics->setColor(userPalette->getColor(UserPalette::BEING));
@@ -2542,7 +2394,7 @@ void Being::drawSpriteAt(Graphics *const graphics,
         graphics->setColor(userPalette->getColorWithAlpha(
             UserPalette::MONSTER_ATTACK_RANGE));
 
-        graphics->fillRectangle(gcn::Rectangle(
+        graphics->fillRectangle(Rect(
             x - attackRange, y - attackRange,
             2 * attackRange + mapTileSize, 2 * attackRange + mapTileSize));
     }
@@ -2607,14 +2459,14 @@ void Being::drawHpBar(Graphics *const graphics, const int maxHP, const int hp,
             || (!hp && maxHP == damage))
         {
             graphics->setColor(userPalette->getColorWithAlpha(color1));
-            graphics->fillRectangle(gcn::Rectangle(
+            graphics->fillRectangle(Rect(
                 x, y, dx, height));
             return;
         }
         else if (width - dx <= 0)
         {
             graphics->setColor(userPalette->getColorWithAlpha(color2));
-            graphics->fillRectangle(gcn::Rectangle(
+            graphics->fillRectangle(Rect(
                 x, y, width, height));
             return;
         }
@@ -2624,26 +2476,25 @@ void Being::drawHpBar(Graphics *const graphics, const int maxHP, const int hp,
         if (hp == maxHP)
         {
             graphics->setColor(userPalette->getColorWithAlpha(color1));
-            graphics->fillRectangle(gcn::Rectangle(
+            graphics->fillRectangle(Rect(
                 x, y, dx, height));
             return;
         }
         else if (width - dx <= 0)
         {
             graphics->setColor(userPalette->getColorWithAlpha(color2));
-            graphics->fillRectangle(gcn::Rectangle(
+            graphics->fillRectangle(Rect(
                 x, y, width, height));
             return;
         }
     }
 
     graphics->setColor(userPalette->getColorWithAlpha(color1));
-    graphics->fillRectangle(gcn::Rectangle(
+    graphics->fillRectangle(Rect(
         x, y, dx, height));
 
     graphics->setColor(userPalette->getColorWithAlpha(color2));
-    graphics->fillRectangle(gcn::Rectangle(
-        x + dx, y, width - dx, height));
+    graphics->fillRectangle(Rect(x + dx, y, width - dx, height));
 }
 
 void Being::setHP(const int hp)
@@ -3297,6 +3148,7 @@ void Being::removePet(const int id)
                 actorManager->erase(pet);
                 mPets.erase(it);
                 delete pet;
+                return;
             }
         }
     }
diff --git a/src/being/being.h b/src/being/being.h
index b9039bce3..2521eb0c3 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -23,12 +23,8 @@
 #ifndef BEING_BEING_H
 #define BEING_BEING_H
 
-#include "equipment.h"
-
 #include "resources/beinginfo.h"
 
-#include <guichan/color.hpp>
-
 #include <map>
 
 #include "localconsts.h"
@@ -45,6 +41,8 @@ static const int DEFAULT_BEING_HEIGHT = 32;
 
 class AnimatedSprite;
 class BeingCacheEntry;
+class Color;
+class Equipment;
 class FlashText;
 class Guild;
 class ItemInfo;
@@ -474,17 +472,13 @@ class Being : public ActorSprite, public ConfigListener
         }
 
         /**
-         * Sets the walk speed.
-         * in pixels per second for eAthena,
-         * in tiles per second for Manaserv.
+         * Sets the walk speed in pixels per second.
          */
         void setWalkSpeed(Vector speed)
         { mWalkSpeed = speed; mSpeed = speed.x; }
 
         /**
-         * Gets the walk speed.
-         * in pixels per second for eAthena,
-         * in tiles per second for Manaserv (0.1 precision).
+         * Gets the walk speed in pixels per second.
          */
         Vector getWalkSpeed() const A_WARN_UNUSED
         { return mWalkSpeed; }
@@ -967,7 +961,7 @@ class Being : public ActorSprite, public ConfigListener
          * Holds a text object when the being displays it's name, 0 otherwise
          */
         FlashText *mDispName;
-        const gcn::Color *mNameColor;
+        const Color *mNameColor;
 
         /** Engine-related infos about weapon. */
         const ItemInfo *mEquippedWeapon;
@@ -977,7 +971,7 @@ class Being : public ActorSprite, public ConfigListener
 
         Path mPath;
         Text *mText;
-        const gcn::Color *mTextColor;
+        const Color *mTextColor;
 
         Vector mDest;  /**< destination coordinates. */
 
@@ -1039,8 +1033,7 @@ class Being : public ActorSprite, public ConfigListener
 
         /**
          * Walk speed for x and y movement values.
-         * In pixels per second for eAthena,
-         * In pixels per ticks for Manaserv.
+         * In pixels per second.
          * @see MILLISECONDS_IN_A_TICK
          */
         Vector mWalkSpeed;
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 27e48caa7..ea4a2067f 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -123,12 +123,12 @@ void CompoundSprite::draw(Graphics *const graphics,
 
     if (mAlpha == 1.0F && mImage)
     {
-        graphics->drawImage2(mImage, posX + mOffsetX, posY + mOffsetY);
+        graphics->drawImage(mImage, posX + mOffsetX, posY + mOffsetY);
     }
     else if (mAlpha && mAlphaImage)
     {
         mAlphaImage->setAlpha(mAlpha);
-        graphics->drawImage2(mAlphaImage,
+        graphics->drawImage(mAlphaImage,
             posX + mOffsetX, posY + mOffsetY);
     }
     else
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 86db69d8d..3d9d06bef 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -23,6 +23,7 @@
 #include "being/localplayer.h"
 
 #include "actormanager.h"
+#include "animatedsprite.h"
 #include "client.h"
 #include "configuration.h"
 #include "dropshortcut.h"
@@ -43,7 +44,6 @@
 #include "input/keyboardconfig.h"
 
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 #include "gui/viewport.h"
 
 #include "gui/windows/chatwindow.h"
@@ -51,7 +51,6 @@
 #include "gui/windows/okdialog.h"
 #include "gui/windows/outfitwindow.h"
 #include "gui/windows/shopwindow.h"
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/updaterwindow.h"
 
@@ -68,6 +67,7 @@
 #include "resources/iteminfo.h"
 
 #include "resources/db/emotedb.h"
+#include "resources/db/weaponsdb.h"
 
 #include "utils/gettext.h"
 #include "utils/timer.h"
@@ -85,6 +85,8 @@ typedef std::map<int, Guild*>::const_iterator GuildMapCIter;
 
 LocalPlayer *player_node = nullptr;
 
+class SkillDialog;
+
 extern std::list<BeingCacheEntry*> beingInfoCache;
 extern OkDialog *weightNotice;
 extern int weightNoticeTime;
@@ -284,10 +286,6 @@ void LocalPlayer::logic()
         mMessageTime--;
     }
 
-#ifdef MANASERV_SUPPORT
-    PlayerInfo::logic();
-#endif
-
     if (mTarget)
     {
         if (mTarget->getType() == ActorSprite::NPC)
@@ -298,23 +296,10 @@ void LocalPlayer::logic()
         else
         {
             // Find whether target is in range
-#ifdef MANASERV_SUPPORT
-            const int rangeX =
-                (Net::getNetworkType() == ServerInfo::MANASERV) ?
-                static_cast<int>(abs(static_cast<int>(mTarget->getPosition().x
-                - getPosition().x))) :
-                static_cast<int>(abs(mTarget->getTileX() - getTileX()));
-            const int rangeY =
-                (Net::getNetworkType() == ServerInfo::MANASERV) ?
-                static_cast<int>(abs(static_cast<int>(mTarget->getPosition().y
-                - getPosition().y))) :
-                static_cast<int>(abs(mTarget->getTileY() - getTileY()));
-#else
             const int rangeX = static_cast<int>(
                 abs(mTarget->getTileX() - getTileX()));
             const int rangeY = static_cast<int>(
                 abs(mTarget->getTileY() - getTileY()));
-#endif
             const int attackRange = getAttackRange();
             const TargetCursorType targetType = rangeX > attackRange ||
                                                 rangeY > attackRange ?
@@ -418,475 +403,58 @@ void LocalPlayer::setGMLevel(const int level)
     }
 }
 
-#ifdef MANASERV_SUPPORT
-Position LocalPlayer::getNextWalkPosition(const unsigned char dir) const
+void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0)
 {
-    // Compute where the next tile will be set.
-    int dx = 0, dy = 0;
-    if (dir & Being::UP)
-        dy--;
-    if (dir & Being::DOWN)
-        dy++;
-    if (dir & Being::LEFT)
-        dx--;
-    if (dir & Being::RIGHT)
-        dx++;
-
-    const Vector &pos = getPosition();
-
-    // If no map or no direction is given, give back the current player position
-    if (!mMap || (!dx && !dy))
-        return Position(static_cast<int>(pos.x), static_cast<int>(pos.y));
-
-    const int posX = static_cast<int>(pos.x);
-    const int posY = static_cast<int>(pos.y);
-    // Get the current tile pos and its offset
-    const int tileX = posX / mMap->getTileWidth();
-    const int tileY = posY / mMap->getTileHeight();
-    const int offsetX = posX % mMap->getTileWidth();
-    const int offsetY = posY % mMap->getTileHeight();
-    const unsigned char walkMask = getWalkMask();
-    const int radius = getCollisionRadius();
-
-    // Get the walkability of every surrounding tiles.
-    bool wTopLeft = mMap->getWalk(tileX - 1, tileY - 1, walkMask);
-    const bool wTop = mMap->getWalk(tileX, tileY - 1, walkMask);
-    bool wTopRight = mMap->getWalk(tileX + 1, tileY - 1, walkMask);
-    const bool wLeft = mMap->getWalk(tileX - 1, tileY, walkMask);
-    const bool wRight = mMap->getWalk(tileX + 1, tileY, walkMask);
-    bool wBottomLeft = mMap->getWalk(tileX - 1, tileY + 1, walkMask);
-    const bool wBottom = mMap->getWalk(tileX, tileY + 1, walkMask);
-    bool wBottomRight = mMap->getWalk(tileX + 1, tileY + 1, walkMask);
-
-    // Make diagonals unwalkable when both straight directions are blocking
-    if (!wTop)
+    const Party *const party = Party::getParty(1);
+    if (party)
     {
-        if (!wRight)
-            wTopRight = false;
-        if (!wLeft)
-            wTopLeft = false;
-    }
-    if (!wBottom)
-    {
-        if (!wRight)
-            wBottomRight = false;
-        if (!wLeft)
-            wBottomLeft = false;
-    }
-
-    // We'll make tests for each desired direction
-
-    // Handle diagonal cases by setting the way back to a straight direction
-    // when necessary.
-    if (dx && dy)
-    {
-        // Going top-right
-        if (dx > 0 && dy < 0)
-        {
-            if (!wTopRight)
-            {
-                // Choose a straight direction when diagonal target is blocked
-                if (!wTop && wRight)
-                {
-                    dy = 0;
-                }
-                else if (wTop && !wRight)
-                {
-                    dx = 0;
-                }
-                else if (!wTop && !wRight)
-                {
-                    return Position(tileX * mapTileSize + mapTileSize - radius,
-                        tileY * mapTileSize + getCollisionRadius());
-                }
-                else  // Both straight direction are walkable
-                {
-                    // Go right when below the corner
-                    if (offsetY >= (offsetX / mMap->getTileHeight()
-                        - (offsetX / mMap->getTileWidth()
-                        * mMap->getTileHeight()) ))
-                    {
-                        dy = 0;
-                    }
-                    else  // Go up otherwise
-                    {
-                        dx = 0;
-                    }
-                }
-            }
-            else  // The diagonal is walkable
-            {
-                return mMap->checkNodeOffsets(radius, walkMask,
-                    Position(posX + mapTileSize, posY - mapTileSize));
-            }
-        }
-
-        // Going top-left
-        if (dx < 0 && dy < 0)
+        PartyMember *const pm = party->getMember(getName());
+        if (pm)
         {
-            if (!wTopLeft)
-            {
-                // Choose a straight direction when diagonal target is blocked
-                if (!wTop && wLeft)
-                {
-                    dy = 0;
-                }
-                else if (wTop && !wLeft)
-                {
-                    dx = 0;
-                }
-                else if (!wTop && !wLeft)
-                {
-                    return Position(tileX * mapTileSize + radius,
-                                    tileY * mapTileSize + radius);
-                }
-                else  // Both straight direction are walkable
-                {
-                    // Go left when below the corner
-                    if (offsetY >= (offsetX / mMap->getTileWidth()
-                        * mMap->getTileHeight()))
-                    {
-                        dy = 0;
-                    }
-                    else  // Go up otherwise
-                    {
-                        dx = 0;
-                    }
-                }
-            }
-            else  // The diagonal is walkable
-            {
-                return mMap->checkNodeOffsets(radius, walkMask,
-                    Position(posX - mapTileSize, posY - mapTileSize));
-            }
-        }
-
-        // Going bottom-left
-        if (dx < 0 && dy > 0)
-        {
-            if (!wBottomLeft)
-            {
-                // Choose a straight direction when diagonal target is blocked
-                if (!wBottom && wLeft)
-                {
-                    dy = 0;
-                }
-                else if (wBottom && !wLeft)
-                {
-                    dx = 0;
-                }
-                else if (!wBottom && !wLeft)
-                {
-                    return Position(tileX * mapTileSize + radius,
-                        tileY * mapTileSize + mapTileSize - radius);
-                }
-                else  // Both straight direction are walkable
-                {
-                    // Go down when below the corner
-                    if (offsetY >= (offsetX / mMap->getTileHeight()
-                        - (offsetX / mMap->getTileWidth()
-                        * mMap->getTileHeight())))
-                    {
-                        dx = 0;
-                    }
-                    else  // Go left otherwise
-                    {
-                        dy = 0;
-                    }
-                }
-            }
-            else  // The diagonal is walkable
-            {
-                return mMap->checkNodeOffsets(radius, walkMask,
-                    Position(posX - mapTileSize, posY + mapTileSize));
-            }
-        }
-
-        // Going bottom-right
-        if (dx > 0 && dy > 0)
-        {
-            if (!wBottomRight)
-            {
-                // Choose a straight direction when diagonal target is blocked
-                if (!wBottom && wRight)
-                {
-                    dy = 0;
-                }
-                else if (wBottom && !wRight)
-                {
-                    dx = 0;
-                }
-                else if (!wBottom && !wRight)
-                {
-                    return Position(tileX * mapTileSize + mapTileSize - radius,
-                        tileY * mapTileSize + mapTileSize - radius);
-                }
-                else  // Both straight direction are walkable
-                {
-                    // Go down when below the corner
-                    if (offsetY >= (offsetX / mMap->getTileWidth()
-                        * mMap->getTileHeight()))
-                    {
-                        dx = 0;
-                    }
-                    else  // Go right otherwise
-                    {
-                        dy = 0;
-                    }
-                }
-            }
-            else  // The diagonal is walkable
-            {
-                return mMap->checkNodeOffsets(radius, walkMask,
-                    Position(posX + mapTileSize, posY + mapTileSize));
-            }
+            pm->setX(mX);
+            pm->setY(mY);
         }
-    }  // End of diagonal cases
+    }
 
-    // Straight directions
-    // Right direction
-    if (dx > 0 && !dy)
+    if (mPath.empty())
     {
-        // If the straight destination is blocked,
-        // Make the player go the closest possible.
-        if (!wRight)
-        {
-            return Position(tileX * mapTileSize + mapTileSize - radius, posY);
-        }
-        else
-        {
-            if (!wTopRight)
-            {
-                // If we're going to collide with the top-right corner
-                if (offsetY - radius < 0)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + mapTileSize - radius,
-                        tileY * mapTileSize + radius);
-                }
-            }
+        if (mPickUpTarget)
+            pickUp(mPickUpTarget);
 
-            if (!wBottomRight)
-            {
-                // If we're going to collide with the bottom-right corner
-                if (offsetY + radius > mapTileSize)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + mapTileSize - radius,
-                        tileY * mapTileSize + mapTileSize - radius);
-                }
-            }
-            // If the way is clear, step up one checked tile ahead.
-            return mMap->checkNodeOffsets(radius, walkMask,
-                Position(posX + mapTileSize, posY));
-        }
+        if (mWalkingDir)
+            startWalking(mWalkingDir);
     }
-
-    // Left direction
-    if (dx < 0 && !dy)
+    else if (mPath.size() == 1)
     {
-        // If the straight destination is blocked,
-        // Make the player go the closest possible.
-        if (!wLeft)
-        {
-            return Position(tileX * mapTileSize + radius, posY);
-        }
-        else
-        {
-            if (!wTopLeft)
-            {
-                // If we're going to collide with the top-left corner
-                if (offsetY - radius < 0)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + radius,
-                        tileY * mapTileSize + radius);
-                }
-            }
-
-            if (!wBottomLeft)
-            {
-                // If we're going to collide with the bottom-left corner
-                if (offsetY + radius > mapTileSize)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + radius,
-                        tileY * mapTileSize + mapTileSize - radius);
-                }
-            }
-            // If the way is clear, step up one checked tile ahead.
-            return mMap->checkNodeOffsets(radius, walkMask,
-                Position(posX - mapTileSize, posY));
-        }
+        if (mPickUpTarget)
+            pickUp(mPickUpTarget);
     }
 
-    // Up direction
-    if (!dx && dy < 0)
+    if (mGoingToTarget && mTarget && withinAttackRange(mTarget))
     {
-        // If the straight destination is blocked,
-        // Make the player go the closest possible.
-        if (!wTop)
-        {
-            return Position(posX, tileY * mapTileSize + radius);
-        }
-        else
-        {
-            if (!wTopLeft)
-            {
-                // If we're going to collide with the top-left corner
-                if (offsetX - radius < 0)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + radius,
-                        tileY * mapTileSize + radius);
-                }
-            }
-
-            if (!wTopRight)
-            {
-                // If we're going to collide with the top-right corner
-                if (offsetX + radius > mapTileSize)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + mapTileSize - radius,
-                        tileY * mapTileSize + radius);
-                }
-            }
-            // If the way is clear, step up one checked tile ahead.
-            return mMap->checkNodeOffsets(radius,
-                walkMask, Position(posX, posY - mapTileSize));
-        }
+        mAction = Being::STAND;
+        attack(mTarget, true);
+        mGoingToTarget = false;
+        mPath.clear();
+        return;
     }
-
-    // Down direction
-    if (!dx && dy > 0)
+    else if (mGoingToTarget && !mTarget)
     {
-        // If the straight destination is blocked,
-        // Make the player go the closest possible.
-        if (!wBottom)
-        {
-            return Position(posX, tileY * mapTileSize + mapTileSize - radius);
-        }
-        else
-        {
-            if (!wBottomLeft)
-            {
-                // If we're going to collide with the bottom-left corner
-                if (offsetX - radius < 0)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + radius,
-                        tileY * mapTileSize + mapTileSize - radius);
-                }
-            }
-
-            if (!wBottomRight)
-            {
-                // If we're going to collide with the bottom-right corner
-                if (offsetX + radius > mapTileSize)
-                {
-                    // We make the player corrects its offset
-                    // before going further
-                    return Position(tileX * mapTileSize + mapTileSize - radius,
-                        tileY * mapTileSize + mapTileSize - radius);
-                }
-            }
-            // If the way is clear, step up one checked tile ahead.
-            return mMap->checkNodeOffsets(radius,
-                walkMask, Position(posX, posY + mapTileSize));
-        }
+        mGoingToTarget = false;
+        mPath.clear();
     }
 
-    // Return the current position if everything else has failed.
-    return Position(posX, posY);
-}
-#endif
-
-void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0)
-{
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
+    if (mPath.empty())
     {
-        const Party *const party = Party::getParty(1);
-        if (party)
-        {
-            PartyMember *const pm = party->getMember(getName());
-            if (pm)
-            {
-                pm->setX(mX);
-                pm->setY(mY);
-            }
-        }
-
-        if (mPath.empty())
-        {
-            if (mPickUpTarget)
-                pickUp(mPickUpTarget);
-
-            if (mWalkingDir)
-                startWalking(mWalkingDir);
-        }
-        else if (mPath.size() == 1)
-        {
-            if (mPickUpTarget)
-                pickUp(mPickUpTarget);
-        }
-
-        if (mGoingToTarget && mTarget && withinAttackRange(mTarget))
-        {
-            mAction = Being::STAND;
-            attack(mTarget, true);
-            mGoingToTarget = false;
-            mPath.clear();
-            return;
-        }
-        else if (mGoingToTarget && !mTarget)
-        {
-            mGoingToTarget = false;
-            mPath.clear();
-        }
-
-        if (mPath.empty())
-        {
-            if (mNavigatePath.empty() || mAction != MOVE)
-                setAction(STAND);
-            else
-                mNextStep = true;
-        }
+        if (mNavigatePath.empty() || mAction != MOVE)
+            setAction(STAND);
         else
-        {
-            Being::nextTile();
-        }
+            mNextStep = true;
     }
-#ifdef MANASERV_SUPPORT
     else
     {
-        if (!mMap || !dir)
-            return;
-
-        const Vector &pos = getPosition();
-        const Position destination = getNextWalkPosition(dir);
-
-        if (static_cast<int>(pos.x) != destination.x
-            || static_cast<int>(pos.y) != destination.y)
-        {
-            setDestination(destination.x, destination.y);
-        }
-        else if (dir != mDirection)
-        {
-            Net::getPlayerHandler()->setDirection(dir);
-            setDirection(dir);
-        }
+        Being::nextTile();
     }
-#endif
 }
 
 bool LocalPlayer::pickUp(FloorItem *const item)
@@ -914,29 +482,18 @@ bool LocalPlayer::pickUp(FloorItem *const item)
     }
     else if (mPickUpType >= 4 && mPickUpType <= 6)
     {
-#ifdef MANASERV_SUPPORT
-        if (Net::getNetworkType() == ServerInfo::MANASERV)
-        {
-            setDestination(item->getPixelX() + 16, item->getPixelY() + 16);
-            mPickUpTarget = item;
-            mPickUpTarget->addActorSpriteListener(this);
-        }
+        const Vector &playerPos = getPosition();
+        const Path debugPath = mMap->findPath(
+            static_cast<int>(playerPos.x - mapTileSize / 2) / mapTileSize,
+            static_cast<int>(playerPos.y - mapTileSize) / mapTileSize,
+            item->getTileX(), item->getTileY(), getWalkMask(), 0);
+        if (!debugPath.empty())
+            navigateTo(item->getTileX(), item->getTileY());
         else
-#endif
-        {
-            const Vector &playerPos = getPosition();
-            const Path debugPath = mMap->findPath(
-                static_cast<int>(playerPos.x - mapTileSize / 2) / mapTileSize,
-                static_cast<int>(playerPos.y - mapTileSize) / mapTileSize,
-                item->getTileX(), item->getTileY(), getWalkMask(), 0);
-            if (!debugPath.empty())
-                navigateTo(item->getTileX(), item->getTileY());
-            else
-                setDestination(item->getTileX(), item->getTileY());
+            setDestination(item->getTileX(), item->getTileY());
 
-            mPickUpTarget = item;
-            mPickUpTarget->addActorSpriteListener(this);
-        }
+        mPickUpTarget = item;
+        mPickUpTarget->addActorSpriteListener(this);
     }
     return true;
 }
@@ -1022,17 +579,7 @@ void LocalPlayer::setDestination(const int x, const int y)
             }
 
             Being::setDestination(x, y);
-
-#ifdef MANASERV_SUPPORT
-            // Manaserv:
-            // If the destination given to being class is accepted,
-            // we inform the Server.
-            if ((x == mDest.x && y == mDest.y)
-                || Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-            {
-                Net::getPlayerHandler()->setDestination(x, y, mDirection);
-            }
+            Net::getPlayerHandler()->setDestination(x, y, mDirection);
         }
     }
 }
@@ -1040,51 +587,11 @@ void LocalPlayer::setDestination(const int x, const int y)
 void LocalPlayer::setWalkingDir(const unsigned char dir)
 {
     // This function is called by Game::handleInput()
-
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        // First if player is pressing key for the direction he is already
-        // going, do nothing more...
-
-        // Else if he is pressing a key, and its different from what he has
-        // been pressing, stop (do not send this stop to the server) and
-        // start in the new direction
-        if (dir && (dir != getWalkingDir()))
-            stopWalking(false);
-
-        // Else, he is not pressing a key,
-        // and the current path hasn't been sent by mouse,
-        // then, stop (sending to server).
-        else if (!dir)
-        {
-            if (!mPathSetByMouse)
-                stopWalking(true);
-            return;
-        }
-
-        // If the delay to send another walk message to the server hasn't
-        // expired, don't do anything or we could get disconnected for
-        // spamming the server
-        if (get_elapsed_time(mLocalWalkTime) < walkingKeyboardDelay)
-            return;
-    }
-#endif
-
     mWalkingDir = dir;
 
     // If we're not already walking, start walking.
     if (mAction != MOVE && dir)
-    {
         startWalking(dir);
-    }
-#ifdef MANASERV_SUPPORT
-    else if (mAction == MOVE && (Net::getNetworkType()
-             == ServerInfo::MANASERV))
-    {
-        nextTile(dir);
-    }
-#endif
 }
 
 void LocalPlayer::startWalking(const unsigned char dir)
@@ -1098,18 +605,7 @@ void LocalPlayer::startWalking(const unsigned char dir)
     if (mAction == MOVE && !mPath.empty())
     {
         // Just finish the current action, otherwise we get out of sync
-#ifdef MANASERV_SUPPORT
-        if (Net::getNetworkType() == ServerInfo::MANASERV)
-        {
-            const Vector &pos = getPosition();
-            Being::setDestination(static_cast<int>(pos.x),
-                                  static_cast<int>(pos.y));
-        }
-        else
-#endif
-        {
-            Being::setDestination(mX, mY);
-        }
+        Being::setDestination(mX, mY);
         return;
     }
 
@@ -1123,43 +619,32 @@ void LocalPlayer::startWalking(const unsigned char dir)
     if (dir & RIGHT)
         dx++;
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-    {
-        const unsigned char walkMask = getWalkMask();
-        // Prevent skipping corners over colliding tiles
-        if (dx && !mMap->getWalk(mX + dx, mY, walkMask))
-            dx = 0;
-        if (dy && !mMap->getWalk(mX, mY + dy, walkMask))
-            dy = 0;
+    const unsigned char walkMask = getWalkMask();
+    // Prevent skipping corners over colliding tiles
+    if (dx && !mMap->getWalk(mX + dx, mY, walkMask))
+        dx = 0;
+    if (dy && !mMap->getWalk(mX, mY + dy, walkMask))
+        dy = 0;
 
-        // Choose a straight direction when diagonal target is blocked
-        if (dx && dy && !mMap->getWalk(mX + dx, mY + dy, walkMask))
-            dx = 0;
+    // Choose a straight direction when diagonal target is blocked
+    if (dx && dy && !mMap->getWalk(mX + dx, mY + dy, walkMask))
+        dx = 0;
 
-        // Walk to where the player can actually go
-        if ((dx || dy) && mMap->getWalk(mX + dx, mY + dy, walkMask))
-        {
-            setDestination(mX + dx, mY + dy);
-        }
-        else if (dir != mDirection)
-        {
-            // If the being can't move, just change direction
+    // Walk to where the player can actually go
+    if ((dx || dy) && mMap->getWalk(mX + dx, mY + dy, walkMask))
+    {
+        setDestination(mX + dx, mY + dy);
+    }
+    else if (dir != mDirection)
+    {
+        // If the being can't move, just change direction
 
 //            if (client->limitPackets(PACKET_DIRECTION))
-            {
-                Net::getPlayerHandler()->setDirection(dir);
-                setDirection(dir);
-            }
+        {
+            Net::getPlayerHandler()->setDirection(dir);
+            setDirection(dir);
         }
     }
-#ifdef MANASERV_SUPPORT
-    else
-    {
-        nextTile(dir);
-    }
-#endif
 }
 
 void LocalPlayer::stopWalking(const bool sendToServer)
@@ -1236,18 +721,6 @@ bool LocalPlayer::emote(const uint8_t emotion)
 void LocalPlayer::attack(Being *const target, const bool keep,
                          const bool dontChangeEquipment)
 {
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        if (mLastAction != -1)
-            return;
-
-        // Can only attack when standing still
-        if (mAction != STAND && mAction != ATTACK)
-            return;
-    }
-#endif
-
     mKeepAttacking = keep;
 
     if (!target || target->getType() == ActorSprite::NPC)
@@ -1256,59 +729,30 @@ void LocalPlayer::attack(Being *const target, const bool keep,
     if (mTarget != target)
         setTarget(target);
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        const Vector &plaPos = this->getPosition();
-        const Vector &tarPos = mTarget->getPosition();
-        const int dist_x = static_cast<int>(plaPos.x - tarPos.x);
-        const int dist_y = static_cast<int>(plaPos.y - tarPos.y);
+    const int dist_x = target->getTileX() - mX;
+    const int dist_y = target->getTileY() - mY;
 
-        if (abs(dist_y) >= abs(dist_x))
-        {
-            if (dist_y < 0)
-                setDirection(DOWN);
-            else
-                setDirection(UP);
-        }
-        else
-        {
-            if (dist_x < 0)
-                setDirection(RIGHT);
-            else
-                setDirection(LEFT);
-        }
+    // Must be standing or sitting to attack
+    if (mAction != STAND && mAction != SIT)
+        return;
 
-        mLastAction = tick_time;
+    if (abs(dist_y) >= abs(dist_x))
+    {
+        if (dist_y > 0)
+            setDirection(DOWN);
+        else
+            setDirection(UP);
     }
     else
-#endif
     {
-        const int dist_x = target->getTileX() - mX;
-        const int dist_y = target->getTileY() - mY;
-
-        // Must be standing or sitting to attack
-        if (mAction != STAND && mAction != SIT)
-            return;
-
-        if (abs(dist_y) >= abs(dist_x))
-        {
-            if (dist_y > 0)
-                setDirection(DOWN);
-            else
-                setDirection(UP);
-        }
+        if (dist_x > 0)
+            setDirection(RIGHT);
         else
-        {
-            if (dist_x > 0)
-                setDirection(RIGHT);
-            else
-                setDirection(LEFT);
-        }
-
-        mActionTime = tick_time;
+            setDirection(LEFT);
     }
 
+    mActionTime = tick_time;
+
     if (target->getType() != Being::PLAYER || checAttackPermissions(target))
     {
         setAction(ATTACK);
@@ -1322,11 +766,7 @@ void LocalPlayer::attack(Being *const target, const bool keep,
         Net::getPlayerHandler()->attack(target->getId(), mServerAttack);
     }
 
-#ifdef MANASERV_SUPPORT
-    if ((Net::getNetworkType() != ServerInfo::MANASERV) && !keep)
-#else
     if (!keep)
-#endif
         stopAttack();
 }
 
@@ -1474,20 +914,8 @@ bool LocalPlayer::withinAttackRange(const Being *const target,
     if (fixDistance && range == 1)
         range = 2;
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        const Vector &targetPos = target->getPosition();
-        const Vector &pos = getPosition();
-        dx = static_cast<int>(abs(static_cast<int>(targetPos.x - pos.x)));
-        dy = static_cast<int>(abs(static_cast<int>(targetPos.y - pos.y)));
-    }
-    else
-#endif
-    {
-        dx = static_cast<int>(abs(target->getTileX() - mX));
-        dy = static_cast<int>(abs(target->getTileY() - mY));
-    }
+    dx = static_cast<int>(abs(target->getTileX() - mX));
+    dy = static_cast<int>(abs(target->getTileY() - mY));
     return !(dx > range || dy > range);
 }
 
@@ -1497,22 +925,9 @@ void LocalPlayer::setGotoTarget(Being *const target)
         return;
 
     mPickUpTarget = nullptr;
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        mTarget = target;
-        mGoingToTarget = true;
-        const Vector &targetPos = target->getPosition();
-        setDestination(static_cast<int>(targetPos.x),
-            static_cast<int>(targetPos.y));
-    }
-    else
-#endif
-    {
-        setTarget(target);
-        mGoingToTarget = true;
-        setDestination(target->getTileX(), target->getTileY());
-    }
+    setTarget(target);
+    mGoingToTarget = true;
+    setDestination(target->getTileX(), target->getTileY());
 }
 
 void LocalPlayer::handleStatusEffect(StatusEffect *const effect,
@@ -2336,23 +1751,14 @@ void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
     // if attack distance for sword
     if (allowSword)
     {
-        // finding sword
-        item = inv->findItem(571, 0);
-
-        if (!item)
-            item = inv->findItem(570, 0);
-
-        if (!item)
-            item = inv->findItem(579, 0);
-
-        if (!item)
-            item = inv->findItem(867, 0);
-
-        if (!item)
-            item = inv->findItem(536, 0);
-
-        if (!item)
-            item = inv->findItem(758, 0);
+        // searching swords
+        const WeaponsInfos &swords = WeaponsDB::getSwords();
+        FOR_EACH (WeaponsInfosIter, it, swords)
+        {
+            item = inv->findItem(*it, 0);
+            if (item)
+                break;
+        }
 
         // no swords
         if (!item)
@@ -2365,10 +1771,14 @@ void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
         // if need equip shield too
         if (mAttackWeaponType == 3)
         {
-            // finding shield
-            item = inv->findItem(601, 0);
-            if (!item)
-                item = inv->findItem(602, 0);
+            // searching shield
+            const WeaponsInfos &shields = WeaponsDB::getShields();
+            FOR_EACH (WeaponsInfosIter, it, shields)
+            {
+                item = inv->findItem(*it, 0);
+                if (item)
+                    break;
+            }
             if (item && !item->isEquipped())
                 PlayerInfo::equipItem(item, true);
         }
@@ -2376,11 +1786,14 @@ void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
     // big distance. allowed only bow
     else
     {
-        // finding bow
-        item = inv->findItem(545, 0);
-
-        if (!item)
-            item = inv->findItem(530, 0);
+        // searching bow
+        const WeaponsInfos &bows = WeaponsDB::getBows();
+        FOR_EACH (WeaponsInfosIter, it, bows)
+        {
+            item = inv->findItem(*it, 0);
+            if (item)
+                break;
+        }
 
         // no bow
         if (!item)
@@ -2827,24 +2240,24 @@ void LocalPlayer::crazyMoveA()
                     move(1, -1);
                     break;
                 case 'f':
-                    if (mDirection | UP)
+                    if (mDirection & UP)
                         dy = -1;
-                    else if (mDirection | DOWN)
+                    else if (mDirection & DOWN)
                         dy = 1;
-                    if (mDirection | LEFT)
+                    if (mDirection & LEFT)
                         dx = -1;
-                    else if (mDirection | RIGHT)
+                    else if (mDirection & RIGHT)
                         dx = 1;
                     move(dx, dy);
                     break;
                 case 'b':
-                    if (mDirection | UP)
+                    if (mDirection & UP)
                         dy = 1;
-                    else if (mDirection | DOWN)
+                    else if (mDirection & DOWN)
                         dy = -1;
-                    if (mDirection | LEFT)
+                    if (mDirection & LEFT)
                         dx = 1;
-                    else if (mDirection | RIGHT)
+                    else if (mDirection & RIGHT)
                         dx = -1;
                     move(dx, dy);
                     break;
@@ -3192,16 +2605,6 @@ bool LocalPlayer::pickUpItems(int pickUpType)
 void LocalPlayer::moveByDirection(const unsigned char dir)
 {
     int dx = 0, dy = 0;
-#ifdef MANASERV_SUPPORT
-    if (dir & UP)
-        dy -= mapTileSize;
-    if (dir & DOWN)
-        dy += mapTileSize;
-    if (dir & LEFT)
-        dx -= mapTileSize;
-    if (dir & RIGHT)
-        dx += mapTileSize;
-#else
     if (dir & UP)
         dy--;
     if (dir & DOWN)
@@ -3210,8 +2613,6 @@ void LocalPlayer::moveByDirection(const unsigned char dir)
         dx--;
     if (dir & RIGHT)
         dx++;
-#endif
-
     move(dx, dy);
 }
 
@@ -4385,7 +3786,7 @@ void LocalPlayer::setTestParticle(const std::string &fileName,
     }
 }
 
-void AwayListener::action(const gcn::ActionEvent &event)
+void AwayListener::action(const ActionEvent &event)
 {
     if (event.getId() == "ok" && player_node && player_node->getAway())
     {
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 6ba12bd56..5664b03b6 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -23,14 +23,14 @@
 #ifndef BEING_LOCALPLAYER_H
 #define BEING_LOCALPLAYER_H
 
-#include "depricatedlistener.h"
+#include "listeners/depricatedlistener.h"
 
-#include "being/actorspritelistener.h"
 #include "being/being.h"
 
 #include "gui/userpalette.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/actorspritelistener.h"
 
 #include <vector>
 
@@ -41,10 +41,10 @@ class FloorItem;
 class Map;
 class OkDialog;
 
-class AwayListener final : public gcn::ActionListener
+class AwayListener final : public ActionListener
 {
     public:
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 };
 
 /**
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index c9b10b4a6..728fe786f 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -48,11 +48,6 @@ int mCharId = 0;
 Inventory *mInventory = nullptr;
 Equipment *mEquipment = nullptr;
 
-#ifdef MANASERV_SUPPORT
-std::map<int, Special> mSpecials;
-signed char mSpecialRechargeUpdateNeeded = 0;
-#endif
-
 bool mTrading = false;
 int mLevelProgress = 0;
 std::set<int> mProtectedItems;
@@ -365,20 +360,6 @@ int getCharId()
 
 void logic()
 {
-#ifdef MANASERV_SUPPORT
-    if ((mSpecialRechargeUpdateNeeded % 11) == 0)
-    {
-        mSpecialRechargeUpdateNeeded = 0;
-        FOR_EACH (SpecialsMap::iterator, it, mSpecials)
-        {
-            Special &special = it->second;
-            special.currentMana += special.recharge;
-            if (special.currentMana > special.neededMana)
-                special.currentMana = special.neededMana;
-        }
-    }
-    mSpecialRechargeUpdateNeeded++;
-#endif
 }
 
 bool isTrading()
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index a04c77e76..4404791ca 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -30,6 +30,8 @@
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
+#include "listeners/playerrelationslistener.h"
+
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index 360930879..c9a884d2e 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -25,25 +25,24 @@
 
 #include "utils/stringvector.h"
 
-#include "being/playerrelationslistener.h"
-
 #include <list>
 #include <map>
 
 #include "localconsts.h"
 
 class Being;
+class PlayerRelationsListener;
 
 struct PlayerRelation final
 {
-    static const unsigned int EMOTE        = (1 << 0);
-    static const unsigned int SPEECH_FLOAT = (1 << 1);
-    static const unsigned int SPEECH_LOG   = (1 << 2);
-    static const unsigned int WHISPER      = (1 << 3);
-    static const unsigned int TRADE        = (1 << 4);
-    static const unsigned int INVISIBLE    = (1 << 5);
-    static const unsigned int BLACKLIST    = (1 << 6);
-    static const unsigned int ENEMY        = (1 << 7);
+    static const unsigned int EMOTE        = (1U << 0);
+    static const unsigned int SPEECH_FLOAT = (1U << 1);
+    static const unsigned int SPEECH_LOG   = (1U << 2);
+    static const unsigned int WHISPER      = (1U << 3);
+    static const unsigned int TRADE        = (1U << 4);
+    static const unsigned int INVISIBLE    = (1U << 5);
+    static const unsigned int BLACKLIST    = (1U << 6);
+    static const unsigned int ENEMY        = (1U << 7);
 
     static const unsigned int RELATIONS_NR = 7;
     static const unsigned int RELATION_PERMISSIONS[RELATIONS_NR];
diff --git a/src/client.cpp b/src/client.cpp
index ab3add135..5d635f522 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -85,6 +85,8 @@
 #include "net/netconsts.h"
 #include "net/partyhandler.h"
 
+#include "particle/particle.h"
+
 #include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
 #include "resources/surfaceimagehelper.h"
@@ -101,18 +103,15 @@
 #include "resources/db/moddb.h"
 #include "resources/db/monsterdb.h"
 #include "resources/db/npcdb.h"
-#ifdef MANASERV_SUPPORT
-#include "resources/db/specialdb.h"
-#endif
 #include "resources/db/palettedb.h"
 #include "resources/db/petdb.h"
+#include "resources/db/weaponsdb.h"
 
 #include "utils/base64.h"
 #include "utils/cpu.h"
 #include "utils/files.h"
 #include "utils/fuzzer.h"
 #include "utils/gettext.h"
-#include "utils/files.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"
 #include "utils/physfstools.h"
@@ -174,7 +173,7 @@ UserPalette *userPalette = nullptr;
 SoundManager soundManager;
 RenderType openGLMode = RENDER_SOFTWARE;
 
-void ErrorListener::action(const gcn::ActionEvent &event)
+void ErrorListener::action(const ActionEvent &event)
 {
     if (event.getId() == "yes")
         openBrowser(client->getSupportUrl());
@@ -193,26 +192,26 @@ int textures_count = 0;
 extern "C" char const *_nl_locale_name_default(void);
 #endif
 
-class AccountListener final : public gcn::ActionListener
+class AccountListener final : public ActionListener
 {
     public:
-        void action(const gcn::ActionEvent &)
+        void action(const ActionEvent &)
         {
             client->setState(STATE_CHAR_SELECT);
         }
 } accountListener;
 
-class LoginListener final : public gcn::ActionListener
+class LoginListener final : public ActionListener
 {
     public:
-        void action(const gcn::ActionEvent &)
+        void action(const ActionEvent &)
         {
             client->setState(STATE_PRE_LOGIN);
         }
 } loginListener;
 
 Client::Client(const Options &options) :
-    gcn::ActionListener(),
+    ActionListener(),
     mOptions(options),
     mConfigDir(),
     mServerConfigDir(),
@@ -613,10 +612,10 @@ static void updateProgress(int cnt)
 {
     const int progress = cnt + loadingProgressCounter;
     const int h = mainGraphics->mHeight;
-    mainGraphics->setColor(gcn::Color(255, 255, 255));
+    mainGraphics->setColor(Color(255, 255, 255));
     const int maxSize = mainGraphics->mWidth - 100;
     const int width = maxSize * progress / 450;
-    mainGraphics->fillRectangle(gcn::Rectangle(50, h - 100, width, 50));
+    mainGraphics->fillRectangle(Rect(50, h - 100, width, 50));
     mainGraphics->updateScreen();
 }
 
@@ -837,6 +836,7 @@ void Client::gameClear()
     MonsterDB::unload();
     NPCDB::unload();
     AvatarDB::unload();
+    WeaponsDB::unload();
     PaletteDB::unload();
     PETDB::unload();
     StatusEffect::unload();
@@ -1351,7 +1351,7 @@ int Client::gameExec()
                             if (mOptions.chooseDefault)
                             {
                                 static_cast<WorldSelectDialog*>(mCurrentDialog)
-                                    ->action(gcn::ActionEvent(nullptr, "ok"));
+                                    ->action(ActionEvent(nullptr, "ok"));
                             }
                         }
                     }
@@ -1463,10 +1463,8 @@ int Client::gameExec()
                     ItemDB::load();
                     Being::load();
                     MonsterDB::load();
-#ifdef MANASERV_SUPPORT
-                    SpecialDB::load();
-#endif
                     AvatarDB::load();
+                    WeaponsDB::load();
                     NPCDB::load();
                     PETDB::load();
                     EmoteDB::load();
@@ -1529,8 +1527,7 @@ int Client::gameExec()
                     mCurrentDialog = new ConnectionDialog(
                         // TRANSLATORS: connection dialog header
                         _("Connecting to the game server"),
-                        Net::getNetworkType() != ServerInfo::MANASERV ?
-                        STATE_CHOOSE_SERVER : STATE_SWITCH_CHARACTER);
+                        STATE_CHOOSE_SERVER);
                     mCurrentDialog->postInit();
                     Net::getGameHandler()->connect();
                     BLOCK_END("Client::gameExec STATE_CONNECT_GAME")
@@ -1853,7 +1850,7 @@ void Client::optionChanged(const std::string &name)
     }
 }
 
-void Client::action(const gcn::ActionEvent &event)
+void Client::action(const ActionEvent &event)
 {
     std::string tab;
     const std::string &eventId = event.getId();
@@ -1913,6 +1910,12 @@ void Client::initRootDir()
         Configuration portable;
         portable.init(portableName);
 
+        if (mOptions.brandingPath.empty())
+        {
+            branding.init(portableName);
+            branding.setDefaultValues(getBrandingDefaults());
+        }
+
         logger->log("Portable file: %s", portableName.c_str());
 
         if (mOptions.localDataDir.empty())
diff --git a/src/client.h b/src/client.h
index 22567ae94..0e6528ca3 100644
--- a/src/client.h
+++ b/src/client.h
@@ -23,11 +23,11 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "net/serverinfo.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <SDL.h>
 
@@ -57,10 +57,10 @@ extern unsigned int tmwServerVersion;
 extern int start_time;
 extern int textures_count;
 
-class ErrorListener : public gcn::ActionListener
+class ErrorListener : public ActionListener
 {
     public:
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 };
 
 extern std::string errorMessage;
@@ -142,7 +142,8 @@ struct PacketLimit
  * The core part of the client. This class initializes all subsystems, runs
  * the event loop, and shuts everything down again.
  */
-class Client final : public ConfigListener, public gcn::ActionListener
+class Client final : public ConfigListener,
+                     public ActionListener
 {
 public:
     /**
@@ -301,7 +302,7 @@ public:
 
     void optionChanged(const std::string &name) override final;
 
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
     void initTradeFilter() const;
 
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 6d3881432..ef8acc26c 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -22,6 +22,8 @@
 
 #include "commandhandler.h"
 
+#include "commands.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/widgets/tabs/chattab.h"
diff --git a/src/commandhandler.h b/src/commandhandler.h
index de1561d74..b2b74d77d 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -23,15 +23,16 @@
 #ifndef COMMANDHANDLER_H
 #define COMMANDHANDLER_H
 
-#include "commands.h"
-
 #include <list>
+#include <map>
 #include <string>
 
 #include "localconsts.h"
 
 class ChatTab;
 
+struct CommandInfo;
+
 extern ChatTab *localChatTab;
 
 typedef std::map<std::string, const CommandInfo*> CommandsMap;
diff --git a/src/commands.cpp b/src/commands.cpp
index 04cd84166..0cc5cee8a 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1024,7 +1024,7 @@ impHandler0(cacheInfo)
         return;
 
 /*
-    SDLFont *const font = dynamic_cast<SDLFont *const>(chatWindow->getFont());
+    Font *const font = chatWindow->getFont();
     if (!font)
         return;
 
@@ -1323,7 +1323,8 @@ static int uploadUpdate(void *ptr,
 
 static void uploadFile(const std::string &str,
                        const std::string &fileName,
-                       const std::string &addStr)
+                       const std::string &addStr,
+                       ChatTab *const tab)
 {
     UploadChatInfo *const info = new UploadChatInfo();
     Net::Download *const upload = new Net::Download(info,
@@ -1333,35 +1334,39 @@ static void uploadFile(const std::string &str,
     info->upload = upload;
     info->text = str;
     info->addStr = addStr;
+    info->tab = tab;
     upload->setFile(fileName);
     upload->start();
 }
 
-impHandler0(uploadConfig)
+impHandler2(uploadConfig)
 {
     uploadFile(_("Uploaded config into:"),
         config.getFileName(),
-        "?xml");
+        "?xml",
+        tab);
 }
 
-impHandler0(uploadServerConfig)
+impHandler2(uploadServerConfig)
 {
     uploadFile(_("Uploaded server config into:"),
         serverConfig.getFileName(),
-        "?xml");
+        "?xml",
+        tab);
 }
 
-impHandler0(uploadLog)
+impHandler2(uploadLog)
 {
     uploadFile(_("Uploaded log into:"),
         client->getLogFileName(),
-        "?txt");
+        "?txt",
+        tab);
 }
 
 impHandler0(testsdlfont)
 {
 #if defined USE_OPENGL && defined DEBUG_SDLFONT
-    SDLFont *font = new SDLFont("fonts/dejavusans.ttf", 18);
+    Font *font = new Font("fonts/dejavusans.ttf", 18);
     timespec time1;
     timespec time2;
     NullOpenGLGraphics *nullGraphics = new NullOpenGLGraphics;
diff --git a/src/configuration.cpp b/src/configuration.cpp
index d4b9f122b..ed2adfc61 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -22,8 +22,10 @@
 
 #include "configuration.h"
 
-#include "configlistener.h"
 #include "logger.h"
+#include "variabledata.h"
+
+#include "listeners/configlistener.h"
 
 #include "utils/paths.h"
 
diff --git a/src/defaults.cpp b/src/defaults.cpp
index c343f9f11..7a110a539 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -22,6 +22,7 @@
 #include "defaults.h"
 
 #include "graphicsmanager.h"
+#include "variabledata.h"
 
 #include "being/being.h"
 
diff --git a/src/defaults.h b/src/defaults.h
index e4ba4d5ae..abc9eb50c 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -22,13 +22,13 @@
 #ifndef DEFAULTS_H
 #define DEFAULTS_H
 
-#include "variabledata.h"
-
 #include <map>
 #include <string>
 
 #include "localconsts.h"
 
+class VariableData;
+
 typedef std::map<std::string, VariableData*> DefaultsData;
 
 VariableData* createData(const int defData) A_WARN_UNUSED;
diff --git a/src/depricatedevent.cpp b/src/depricatedevent.cpp
index 8d021e2f3..fc499c47b 100644
--- a/src/depricatedevent.cpp
+++ b/src/depricatedevent.cpp
@@ -21,9 +21,10 @@
 
 #include "depricatedevent.h"
 
-#include "depricatedlistener.h"
 #include "variabledata.h"
 
+#include "listeners/depricatedlistener.h"
+
 #include "debug.h"
 
 DepricatedListenMap DepricatedEvent::mBindings;
diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/events/actionevent.h
index b0f75a039..25f936cdd 100644
--- a/src/guichan/include/guichan/actionevent.hpp
+++ b/src/events/actionevent.h
@@ -61,73 +61,76 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_ACTIONEVENT_HPP
-#define GCN_ACTIONEVENT_HPP
+#ifndef EVENTS_ACTIONEVENT_H
+#define EVENTS_ACTIONEVENT_H
 
-#include "guichan/event.hpp"
+#include "events/event.h"
 
 #include <string>
 
 #include "localconsts.h"
 
-namespace gcn
-{
-    class Widget;
+class Widget;
 
-    /**
-     * Represents an action event. An action event is an event
-     * that can be fired by a widget whenever an action has occured.
-     * What exactly an action is is up to the widget that fires
-     * the action event. An example is a Button which fires an action
-     * event as soon as the Button is clicked, another example is
-     * TextField which fires an action event as soon as the enter
-     * key is pressed.
-     *
-     * Any object can listen for actions from widgets by implementing
-     * the ActionListener interface.
-     *
-     * If you have implement a widget of your own it's a good idea to 
-     * let the widget fire action events whenever you feel an action
-     * has occured so action listeners of the widget can be informed
-     * of the state of the widget.
-     *
-     * @see Widget::addActionListener, Widget::removeActionListener,
-     *      Widget::distributeActionEvent
-     * @author Olof Naessén
-     * @since 0.6.0
-     */
-    class ActionEvent final : public Event
-    {
+/**
+  * Represents an action event. An action event is an event
+  * that can be fired by a widget whenever an action has occured.
+  * What exactly an action is is up to the widget that fires
+  * the action event. An example is a Button which fires an action
+  * event as soon as the Button is clicked, another example is
+  * TextField which fires an action event as soon as the enter
+  * key is pressed.
+  *
+  * Any object can listen for actions from widgets by implementing
+  * the ActionListener interface.
+  *
+  * If you have implement a widget of your own it's a good idea to 
+  * let the widget fire action events whenever you feel an action
+  * has occured so action listeners of the widget can be informed
+  * of the state of the widget.
+  *
+  * @see Widget::addActionListener, Widget::removeActionListener,
+  *      Widget::distributeActionEvent
+  * @author Olof Naessén
+  * @since 0.6.0
+  */
+class ActionEvent final : public Event
+{
     public:
         /**
-         * Constructor.
-         *
-         * @param source The source widget of the event.
-         * @param id An identifier of the event.
-         */
-        ActionEvent(Widget *const source, const std::string &id);
+          * Constructor.
+          *
+          * @param source The source widget of the event.
+          * @param id An identifier of the event.
+          */
+        ActionEvent(Widget *const source, const std::string &id) :
+            Event(source),
+            mId(id)
+        {
+        }
 
         /**
-         * Destructor.
-         */
-        virtual ~ActionEvent();
+          * Destructor.
+          */
+        virtual ~ActionEvent()
+        { }
 
         /**
-         * Gets the identifier of the event. An identifier can
-         * be used to distinguish from two actions from the same
-         * widget or to let many widgets fire the same widgets
-         * that should be treated equally.
-         *
-         * @return The identifier of the event.
-         */
-        const std::string& getId() const A_WARN_UNUSED;
+          * Gets the identifier of the event. An identifier can
+          * be used to distinguish from two actions from the same
+          * widget or to let many widgets fire the same widgets
+          * that should be treated equally.
+          *
+          * @return The identifier of the event.
+          */
+        const std::string &getId() const A_WARN_UNUSED
+        { return mId; }
 
     protected:
         /**
-         * Holds the identifier of the event.
-         */
+          * Holds the identifier of the event.
+          */
         std::string mId;
-    };
-}  // namespace gcn
+};
 
-#endif  // GCN_ACTIONEVENT_HPP
+#endif  // EVENTS_ACTIONEVENT_H
diff --git a/src/guichan/include/guichan/event.hpp b/src/events/event.h
index 2a1f4ca4b..63ccb207d 100644
--- a/src/guichan/include/guichan/event.hpp
+++ b/src/events/event.h
@@ -61,53 +61,54 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_EVENT_HPP
-#define GCN_EVENT_HPP
+#ifndef EVENTS_EVENT_H
+#define EVENTS_EVENT_H
 
 #include "localconsts.h"
 
-namespace gcn
-{
-    class Widget;
+class Widget;
 
-    /**
-     * Base class for all events. All events in Guichan should
-     * inherit from this class.
-     *
-     * @author Olof Naessén
-     * @since 0.6.0
-     */
-    class Event
-    {
+/**
+  * Base class for all events. All events in Guichan should
+  * inherit from this class.
+  *
+  * @author Olof Naessén
+  * @since 0.6.0
+  */
+class Event
+{
     public:
         /**
-         * Constructor.
-         *
-         * @param source The source widget of the event.
-         */
-        explicit Event(Widget *const source);
+          * Constructor.
+          *
+          * @param source The source widget of the event.
+          */
+        explicit Event(Widget *const source) :
+            mSource(source)
+        { }
 
         A_DELETE_COPY(Event)
 
         /**
-         * Destructor.
-         */
-        virtual ~Event();
+          * Destructor.
+          */
+        virtual ~Event()
+        { }
 
         /**
-         * Gets the source widget of the event. The function
-         * is used to tell which widget fired an event.
-         *
-         * @return The source widget of the event.
-         */
-        Widget* getSource() const A_WARN_UNUSED;
+          * Gets the source widget of the event. The function
+          * is used to tell which widget fired an event.
+          *
+          * @return The source widget of the event.
+          */
+        Widget* getSource() const A_WARN_UNUSED
+        { return mSource; }
 
     protected:
         /**
-         * Holds the source widget of the event.
-         */
+          * Holds the source widget of the event.
+          */
         Widget* mSource;
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_EVENT_HPP
+#endif  // EVENTS_EVENT_H
diff --git a/src/input/inputevent.h b/src/events/inputevent.h
index 61f80c8e2..2d8a36796 100644
--- a/src/input/inputevent.h
+++ b/src/events/inputevent.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INPUT_INPUTEVENT_H
-#define INPUT_INPUTEVENT_H
+#ifndef EVENTS_INPUTEVENT_H
+#define EVENTS_INPUTEVENT_H
 
 #include <map>
 #include <vector>
@@ -41,11 +41,14 @@ typedef KeyTimeMap::iterator KeyTimeMapIter;
 
 struct InputEvent final
 {
-    InputEvent(const int action0, const int mask0);
+    InputEvent(const int action0, const int mask0) :
+        action(action0),
+        mask(mask0)
+    { }
 
     int action;
 
     int mask;
 };
 
-#endif  // INPUT_INPUTEVENT_H
+#endif  // EVENTS_INPUTEVENT_H
diff --git a/src/events/inputguievent.h b/src/events/inputguievent.h
new file mode 100644
index 000000000..2e5136ea2
--- /dev/null
+++ b/src/events/inputguievent.h
@@ -0,0 +1,187 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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/>.
+ */
+
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef EVENTS_INPUTGUIEVENT_H
+#define EVENTS_INPUTGUIEVENT_H
+
+#include "events/event.h"
+
+/**
+  * Base class for all events concerning input.
+  *
+  * @author Olof Naessén
+  * @since 0.6.0
+  */
+class InputGuiEvent: public Event
+{
+    public:
+        /**
+          * Constructor.
+          *
+          * @param source The source widget of the event.
+          * @param isShiftPressed True if shift is pressed, false otherwise.
+          * @param isControlPressed True if control is pressed, false otherwise.
+          * @param isAltPressed True if alt is pressed, false otherwise.
+          * @param isMetaPressed True if meta is pressed, false otherwise.
+          */
+        InputGuiEvent(Widget *const source,
+                      const bool shiftPressed,
+                      const bool controlPressed,
+                      const bool altPressed,
+                      const bool metaPressed) :
+            Event(source),
+            mShiftPressed(shiftPressed),
+            mControlPressed(controlPressed),
+            mAltPressed(altPressed),
+            mMetaPressed(metaPressed),
+            mIsConsumed(false)
+        { }
+
+        /**
+          * Checks if shift is pressed.
+          *
+          * @return True if shift was pressed at the same time as the key,
+          *         false otherwise.
+          */
+        bool isShiftPressed() const A_WARN_UNUSED
+        { return mShiftPressed; }
+
+        /**
+          * Checks if control is pressed.
+          *
+          * @return True if control was pressed at the same time as the key,
+          *         false otherwise.
+          */
+        bool isControlPressed() const A_WARN_UNUSED
+        { return mControlPressed; }
+
+        /**
+          * Checks if alt is pressed.
+          *
+          * @return True if alt was pressed at the same time as the key,
+          *         false otherwise.
+          */
+        bool isAltPressed() const A_WARN_UNUSED
+        { return mAltPressed; }
+
+        /**
+          * Checks whether meta is pressed.
+          *
+          * @return True if meta was pressed at the same time as the key,
+          *         false otherwise.
+          */
+        bool isMetaPressed() const A_WARN_UNUSED
+        { return mMetaPressed; }
+
+        /**
+          * Marks the event as consumed. Input event listeners may discard
+          * consumed input or act on consumed input. An example of a widget
+          * that discards consumed input is the ScrollArea widget that 
+          * discards consumed mouse wheel events so the ScrollArea will not 
+          * scroll if for instance a Slider's value inside the ScrollArea was 
+          * changed with the mouse wheel.
+          *
+          * @see isConsumed
+          */
+        void consume()
+        { mIsConsumed = true; }
+
+        /**
+          * Checks if the input event is consumed.
+          *
+          * @return True if the input event is consumed, 
+          *         false otherwise.
+          * @see consume
+          */
+        bool isConsumed() const A_WARN_UNUSED
+        { return mIsConsumed; }
+
+    protected:
+        /**
+          * True if shift is pressed, false otherwise.
+          */
+        bool mShiftPressed;
+
+        /**
+          * True if control is pressed, false otherwise.
+          */
+        bool mControlPressed;
+
+        /**
+          * True if alt is pressed, false otherwise.
+          */
+        bool mAltPressed;
+
+        /**
+          * True if meta is pressed, false otherwise.
+          */
+        bool mMetaPressed;
+
+        /**
+          * True if the input event is consumed, 
+          * false otherwise.
+          */
+        bool mIsConsumed;
+};
+
+#endif  // EVENTS_INPUTGUIEVENT_H
diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/events/keyevent.h
index b3a91f640..360d229d7 100644
--- a/src/guichan/include/guichan/keyevent.hpp
+++ b/src/events/keyevent.h
@@ -61,25 +61,25 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_KEYEVENT_HPP
-#define GCN_KEYEVENT_HPP
+#ifndef EVENTS_KEYEVENT_H
+#define EVENTS_KEYEVENT_H
 
-#include "guichan/inputevent.hpp"
-#include "guichan/key.hpp"
+#include "events/inputguievent.h"
+#include "input/key.h"
 
-namespace gcn
-{
-    class Widget;
+#include <string>
+
+class Widget;
 
-    /**
-     * Represents a key event.
-     */
-    class KeyEvent: public InputEvent
-    {
+/**
+  * Represents a key event.
+  */
+class KeyEvent: public InputGuiEvent
+{
     public:
         /**
-         * Key event types.
-         */
+          * Key event types.
+          */
         enum
         {
             PRESSED = 0,
@@ -87,18 +87,18 @@ namespace gcn
         };
 
         /**
-         * Constructor.
-         *
-         * @param source The source widget of the event.
-         * @param shiftPressed True if shift is pressed, false otherwise.
-         * @param controlPressed True if control is pressed, false otherwise.
-         * @param altPressed True if alt is pressed, false otherwise.
-         * @param metaPressed True if meta is pressed, false otherwise.
-         * @param type The type of the event. A value from KeyEventType.
-         * @param numericPad True if the event occured on the numeric pad,
-         *                     false otherwise.
-         * @param key The key of the event.
-         */
+          * Constructor.
+          *
+          * @param source The source widget of the event.
+          * @param shiftPressed True if shift is pressed, false otherwise.
+          * @param controlPressed True if control is pressed, false otherwise.
+          * @param altPressed True if alt is pressed, false otherwise.
+          * @param metaPressed True if meta is pressed, false otherwise.
+          * @param type The type of the event. A value from KeyEventType.
+          * @param numericPad True if the event occured on the numeric pad,
+          *                     false otherwise.
+          * @param key The key of the event.
+          */
         KeyEvent(Widget *const source,
                  const bool shiftPressed,
                  const bool controlPressed,
@@ -106,52 +106,86 @@ namespace gcn
                  const bool metaPressed,
                  const unsigned int type,
                  const bool numericPad,
-                 const Key& key);
+                 const int actionId,
+                 const Key &key) :
+            InputGuiEvent(source,
+                          shiftPressed,
+                          controlPressed,
+                          altPressed,
+                          metaPressed),
+            mKey(key),
+#ifdef USE_SDL2
+            mText(),
+#endif
+            mType(type),
+            mActionId(actionId),
+            mIsNumericPad(numericPad)
+        { }
 
         /**
-         * Destructor.
-         */
-        virtual ~KeyEvent();
+          * Destructor.
+          */
+        virtual ~KeyEvent()
+        { }
 
         /**
-         * Gets the type of the event.
-         *
-         * @return The type of the event.
-         */
-        unsigned int getType() const A_WARN_UNUSED;
+          * Gets the type of the event.
+          *
+          * @return The type of the event.
+          */
+        unsigned int getType() const A_WARN_UNUSED
+        { return mType; }
 
         /**
-         * Checks if the key event occured on the numeric pad.
-         *
-         * @return True if key event occured on the numeric pad,
-         *         false otherwise.
-         *
-         */
-        bool isNumericPad() const A_WARN_UNUSED;
+          * Checks if the key event occured on the numeric pad.
+          *
+          * @return True if key event occured on the numeric pad,
+          *         false otherwise.
+          *
+          */
+        bool isNumericPad() const A_WARN_UNUSED
+        { return mIsNumericPad; }
 
         /**
-         * Gets the key of the event.
-         *
-         * @return The key of the event.
-         */
-        const Key& getKey() const A_WARN_UNUSED;
+          * Gets the key of the event.
+          *
+          * @return The key of the event.
+          */
+        const Key &getKey() const A_WARN_UNUSED
+        { return mKey; }
+
+        int getActionId() const A_WARN_UNUSED
+        { return mActionId; }
+
+#ifdef USE_SDL2
+        void setText(const std::string &text)
+        { mText = text; }
+
+        std::string getText() const
+        { return mText; }
+#endif
 
     protected:
+        /** 
+          * Holds the key of the key event.
+          */
+        Key mKey;
+
+#ifdef USE_SDL2
+        std::string mText;
+#endif
+
         /**
-         * Holds the type of the key event.
-         */
+          * Holds the type of the key event.
+          */
         unsigned int mType;
 
+        int mActionId;
+
         /**
-         * True if the numeric pad was used, false otherwise.
-         */
+          * True if the numeric pad was used, false otherwise.
+          */
         bool mIsNumericPad;
+};
 
-        /** 
-         * Holds the key of the key event.
-         */
-        Key mKey;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_KEYEVENT_HPP
+#endif  // EVENTS_KEYEVENT_H
diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/events/mouseevent.h
index 57af098ab..a717980f9 100644
--- a/src/guichan/include/guichan/mouseevent.hpp
+++ b/src/events/mouseevent.h
@@ -61,40 +61,42 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_MOUSEEVENT_HPP
-#define GCN_MOUSEEVENT_HPP
+#ifndef EVENTS_MOUSEEVENT_H
+#define EVENTS_MOUSEEVENT_H
 
-#include "guichan/inputevent.hpp"
+#include "events/inputguievent.h"
 
 namespace gcn
 {
     class Gui;
-    class Widget;
-
-    /**
-     * Represents a mouse event.
-     *
-     * @author Olof Naessén
-     * @since 0.6.0
-     */
-    class MouseEvent: public InputEvent
-    {
+}
+
+class Widget;
+
+/**
+  * Represents a mouse event.
+  *
+  * @author Olof Naessén
+  * @since 0.6.0
+  */
+class MouseEvent: public InputGuiEvent
+{
     public:
         /**
-         * Constructor.
-         *
-         * @param source The source widget of the mouse event.
-         * @param shiftPressed True if shift is pressed, false otherwise.
-         * @param controlPressed True if control is pressed, false otherwise.
-         * @param altPressed True if alt is pressed, false otherwise.
-         * @param metaPressed True if meta is pressed, false otherwise.
-         * @param type The type of the mouse event.
-         * @param button The button of the mouse event.
-         * @param x The x coordinate of the event relative to the source widget.
-         * @param y The y coordinate of the event relative the source widget.
-         * @param clickCount The number of clicks generated with the same button.
-         *                   It's set to zero if another button is used.
-         */
+          * Constructor.
+          *
+          * @param source The source widget of the mouse event.
+          * @param shiftPressed True if shift is pressed, false otherwise.
+          * @param controlPressed True if control is pressed, false otherwise.
+          * @param altPressed True if alt is pressed, false otherwise.
+          * @param metaPressed True if meta is pressed, false otherwise.
+          * @param type The type of the mouse event.
+          * @param button The button of the mouse event.
+          * @param x The x coordinate of the event relative to the source widget.
+          * @param y The y coordinate of the event relative the source widget.
+          * @param clickCount The number of clicks generated with the same button.
+          *                   It's set to zero if another button is used.
+          */
         MouseEvent(Widget *const source,
                    const bool shiftPressed,
                    const bool controlPressed,
@@ -104,53 +106,76 @@ namespace gcn
                    const unsigned int button,
                    const int x,
                    const int y,
-                   const int clickCount);
+                   const int clickCount) :
+            InputGuiEvent(source,
+                          shiftPressed,
+                          controlPressed,
+                          altPressed,
+                          metaPressed),
+            mType(type),
+            mButton(button),
+            mX(x),
+            mY(y),
+            mClickCount(clickCount)
+        {
+        }
 
         /**
-         * Gets the button of the mouse event.
-         *
-         * @return The button of the mouse event.
-         */
-        unsigned int getButton() const A_WARN_UNUSED;
+          * Gets the button of the mouse event.
+          *
+          * @return The button of the mouse event.
+          */
+        unsigned int getButton() const A_WARN_UNUSED
+        { return mButton; }
 
         /**
-         * Gets the x coordinate of the mouse event. 
-         * The coordinate relative to widget the mouse listener
-         * receiving the events have registered to.
-         *
-         * @return The x coordinate of the mouse event.
-         * @see Widget::addMouseListener, Widget::removeMouseListener
-         */
-        int getX() const A_WARN_UNUSED;
+          * Gets the x coordinate of the mouse event. 
+          * The coordinate relative to widget the mouse listener
+          * receiving the events have registered to.
+          *
+          * @return The x coordinate of the mouse event.
+          * @see Widget::addMouseListener, Widget::removeMouseListener
+          */
+        int getX() const A_WARN_UNUSED
+        { return mX; }
 
         /**
-         * Gets the y coordinate of the mouse event. 
-         * The coordinate relative to widget the mouse listener
-         * receiving the events have registered to.
-         *
-         * @return The y coordinate of the mouse event.
-         * @see Widget::addMouseListener, Widget::removeMouseListener
-         */
-        int getY() const A_WARN_UNUSED;
+          * Gets the y coordinate of the mouse event. 
+          * The coordinate relative to widget the mouse listener
+          * receiving the events have registered to.
+          *
+          * @return The y coordinate of the mouse event.
+          * @see Widget::addMouseListener, Widget::removeMouseListener
+          */
+        int getY() const A_WARN_UNUSED
+        { return mY; }
 
         /**
-         * Gets the number of clicks generated with the same button.
-         * It's set to zero if another button is used.
-         *
-         * @return The number of clicks generated with the same button.
-         */
-        int getClickCount() const A_WARN_UNUSED;
+          * Gets the number of clicks generated with the same button.
+          * It's set to zero if another button is used.
+          *
+          * @return The number of clicks generated with the same button.
+          */
+        int getClickCount() const A_WARN_UNUSED
+        { return mClickCount; }
 
         /**
-         * Gets the type of the event.
-         *
-         * @return The type of the event.
-         */
-        unsigned int getType() const A_WARN_UNUSED;
+          * Gets the type of the event.
+          *
+          * @return The type of the event.
+          */
+        unsigned int getType() const A_WARN_UNUSED
+        { return mType; }
+
+        void setX(int n)
+        { mX = n; }
+
+        void setY(int n)
+        { mY = n; }
 
         /**
-         * Mouse event types.
-         */
+          * Mouse event types.
+          */
         enum
         {
             MOVED = 0,
@@ -165,8 +190,8 @@ namespace gcn
         };
 
         /**
-         * Mouse button types.
-         */
+          * Mouse button types.
+          */
         enum
         {
             EMPTY = 0,
@@ -177,41 +202,40 @@ namespace gcn
 
     protected:
         /**
-         * Holds the type of the mouse event.
-         */
+          * Holds the type of the mouse event.
+          */
         unsigned int mType;
 
         /**
-         * Holds the button of the mouse event.
-         */
+          * Holds the button of the mouse event.
+          */
         unsigned int mButton;
 
         /**
-         * Holds the x-coordinate of the mouse event.
-         */
+          * Holds the x-coordinate of the mouse event.
+          */
         int mX;
 
         /**
-         * Holds the y-coordinate of the mouse event.
-         */
+          * Holds the y-coordinate of the mouse event.
+          */
         int mY;
 
         /**
-         * The number of clicks generated with the same button.
-         * It's set to zero if another button is used.
-         */
+          * The number of clicks generated with the same button.
+          * It's set to zero if another button is used.
+          */
         int mClickCount;
 
         /**
-         * Gui is a friend of this class in order to be able to manipulate
-         * the protected member variables of this class and at the same time
-         * keep the MouseEvent class as const as possible. Gui needs to
-         * update the x och y coordinates for the coordinates to be relative
-         * to widget the mouse listener receiving the events have registered 
-         * to. 
-         */
-        friend class Gui;
-    };
-}  // namespace gcn
-
-#endif  // GCN_MOUSEEVENT_HPP
+          * Gui is a friend of this class in order to be able to manipulate
+          * the protected member variables of this class and at the same time
+          * keep the MouseEvent class as const as possible. Gui needs to
+          * update the x och y coordinates for the coordinates to be relative
+          * to widget the mouse listener receiving the events have registered 
+          * to. 
+          */
+        friend class gcn::Gui;
+};
+
+#endif  // EVENTS_MOUSEEVENT_H
diff --git a/src/guichan/include/guichan/selectionevent.hpp b/src/events/selectionevent.h
index a4a3da0b3..927b66f77 100644
--- a/src/guichan/include/guichan/selectionevent.hpp
+++ b/src/events/selectionevent.h
@@ -61,38 +61,38 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_SELECTIONEVENT_HPP
-#define GCN_SELECTIONEVENT_HPP
+#ifndef EVENTS_SELECTIONEVENT_H
+#define EVENTS_SELECTIONEVENT_H
 
-#include "guichan/event.hpp"
+#include "events/event.h"
 
 #include "localconsts.h"
 
-namespace gcn
-{
-    class Widget;
+class Widget;
 
-    /**
-     * Represents a selection event.
-     *
-     * @author Olof Naessén
-     * @since 0.8.0
-     */
-    class SelectionEvent final: public Event
-    {
+/**
+  * Represents a selection event.
+  *
+  * @author Olof Naessén
+  * @since 0.8.0
+  */
+class SelectionEvent final: public Event
+{
     public:
         /**
-         * Constructor.
-         *
-         * @param source source The widget of the selection event.
-         */
-        explicit SelectionEvent(Widget *const source);
+          * Constructor.
+          *
+          * @param source source The widget of the selection event.
+          */
+        explicit SelectionEvent(Widget *const source) :
+            Event(source)
+        { }
 
         /**
-         * Destructor.
-         */
-        virtual ~SelectionEvent();
-    };
-}  // namespace gcn
+          * Destructor.
+          */
+        virtual ~SelectionEvent()
+        { }
+};
 
-#endif  // end GCN_SELECTIONEVENT_HPP
+#endif  // EVENTS_SELECTIONEVENT_H
diff --git a/src/eventsmanager.h b/src/eventsmanager.h
index 5433a83fb..e54c4dee4 100644
--- a/src/eventsmanager.h
+++ b/src/eventsmanager.h
@@ -21,7 +21,7 @@
 #ifndef EVENTSMANAGER_H
 #define EVENTSMANAGER_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include <string>
 
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index bf8b54f0b..9ffa8f64a 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -26,8 +26,8 @@
 
 #include "render/graphics.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 #include "gui/userpalette.h"
 
 #include "resources/iteminfo.h"
@@ -109,7 +109,7 @@ void FloorItem::draw(Graphics *const graphics,
     BLOCK_START("FloorItem::draw")
     const int x = mX * mMap->getTileWidth() + offsetX;
     const int y = mY * mMap->getTileHeight() + offsetY;
-    gcn::Font *font = nullptr;
+    Font *font = nullptr;
 
     if (mHighlight)
     {
@@ -122,24 +122,23 @@ void FloorItem::draw(Graphics *const graphics,
 
             if (curTime > mDropTime + 28 && curTime < mDropTime + 50)
             {
-                graphics->setColor(gcn::Color(80, 200, 20, 200));
-                graphics->fillRectangle(gcn::Rectangle(
+                graphics->setColor(Color(80, 200, 20, 200));
+                graphics->fillRectangle(Rect(
                                         x, y, dx, dy));
             }
             else if (curTime > mDropTime + 19
                      && curTime < mDropTime + 28)
             {
-                graphics->setColor(gcn::Color(200, 80, 20,
+                graphics->setColor(Color(200, 80, 20,
                     80 + 10 * (curTime - mDropTime - 18)));
-                graphics->fillRectangle(gcn::Rectangle(
+                graphics->fillRectangle(Rect(
                     x, y, dx, dy));
             }
             else if (curTime > mDropTime && curTime < mDropTime + 20)
             {
-                graphics->setColor(gcn::Color(20, 20, 255,
+                graphics->setColor(Color(20, 20, 255,
                     7 * (curTime - mDropTime)));
-                graphics->fillRectangle(gcn::Rectangle(
-                                        x, y, dx, dy));
+                graphics->fillRectangle(Rect(x, y, dx, dy));
             }
         }
     }
@@ -153,7 +152,7 @@ void FloorItem::draw(Graphics *const graphics,
     {
         if (font && mAmount > 1)
         {
-//            graphics->setColor(gcn::Color(255, 255, 255, 100));
+//            graphics->setColor(Color(255, 255, 255, 100));
             graphics->setColor(userPalette->getColor(
                 UserPalette::FLOOR_ITEM_TEXT));
             font->drawString(graphics, toString(mAmount), x, y);
diff --git a/src/game.cpp b/src/game.cpp
index 26807b8b6..253c4bff2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -49,9 +49,6 @@
 #include "input/keyboardconfig.h"
 
 #include "gui/gui.h"
-#ifdef MANASERV_SUPPORT
-#include "gui/specialswindow.h"
-#endif
 #include "gui/viewport.h"
 #include "gui/windowmenu.h"
 
@@ -139,9 +136,6 @@ DebugWindow *debugWindow = nullptr;
 ShortcutWindow *itemShortcutWindow = nullptr;
 ShortcutWindow *emoteShortcutWindow = nullptr;
 OutfitWindow *outfitWindow = nullptr;
-#ifdef MANASERV_SUPPORT
-SpecialsWindow *specialsWindow = nullptr;
-#endif
 ShortcutWindow *dropShortcutWindow = nullptr;
 ShortcutWindow *spellShortcutWindow = nullptr;
 WhoIsOnline *whoIsOnline = nullptr;
@@ -236,7 +230,7 @@ static void createGuiWindows()
     for (unsigned f = 0; f < SHORTCUT_TABS; f ++)
     {
         itemShortcutWindow->addTab(toString(f + 1),
-            new ItemShortcutContainer(f));
+            new ItemShortcutContainer(nullptr, f));
     }
     if (config.getBoolValue("showDidYouKnow"))
     {
@@ -245,20 +239,20 @@ static void createGuiWindows()
     }
 
     emoteShortcutWindow = new ShortcutWindow("EmoteShortcut",
-        new EmoteShortcutContainer, "emotes.xml", 130, 480);
+        new EmoteShortcutContainer(nullptr),
+        "emotes.xml",
+        130, 480);
     outfitWindow = new OutfitWindow();
-#ifdef MANASERV_SUPPORT
-    specialsWindow = new SpecialsWindow();
-#endif
     dropShortcutWindow = new ShortcutWindow("DropShortcut",
-        new DropShortcutContainer, "drops.xml");
+        new DropShortcutContainer(nullptr),
+        "drops.xml");
 
     spellShortcutWindow = new ShortcutWindow("SpellShortcut", "spells.xml",
                                              265, 328);
     for (unsigned f = 0; f < SPELL_SHORTCUT_TABS; f ++)
     {
         spellShortcutWindow->addTab(toString(f + 1),
-            new SpellShortcutContainer(f));
+            new SpellShortcutContainer(nullptr, f));
     }
 
     botCheckerWindow = new BotCheckerWindow;
@@ -370,9 +364,6 @@ static void destroyGuiWindows()
     del_0(itemShortcutWindow)
     del_0(emoteShortcutWindow)
     del_0(outfitWindow)
-#ifdef MANASERV_SUPPORT
-    del_0(specialsWindow)
-#endif
     del_0(socialWindow)
     del_0(dropShortcutWindow);
     del_0(spellShortcutWindow);
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index 15256113f..8746bcce3 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -38,10 +38,12 @@
 
 #endif
 
-#include "resources/image.h"
+#include <SDL_video.h>
 
 #include <vector>
 
+class Image;
+
 struct DoubleRect final
 {
     SDL_Rect src;
diff --git a/src/guichan/basiccontainer.cpp b/src/gui/base/basiccontainer.cpp
index 239a8544e..f323366ad 100644
--- a/src/guichan/basiccontainer.cpp
+++ b/src/gui/base/basiccontainer.cpp
@@ -65,15 +65,10 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/basiccontainer.hpp"
+#include "gui/base/basiccontainer.hpp"
 
 #include <algorithm>
 
-#include "guichan/exception.hpp"
-#include "guichan/focushandler.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/mouseinput.hpp"
-
 #include "debug.h"
 
 namespace gcn
@@ -95,8 +90,6 @@ namespace gcn
                 return;
             }
         }
-
-        throw GCN_EXCEPTION("There is no such widget in this container.");
     }
 
     void BasicContainer::moveToBottom(Widget* widget)
@@ -105,11 +98,10 @@ namespace gcn
         iter = std::find(mWidgets.begin(), mWidgets.end(), widget);
 
         if (iter == mWidgets.end())
-            throw GCN_EXCEPTION("There is no such widget in this container.");
+            return;
 
         mWidgets.erase(iter);
         mWidgets.insert(mWidgets.begin(), widget);
-//        mWidgets.push_front(widget);
     }
 
     void BasicContainer::death(const Event& event)
@@ -118,14 +110,14 @@ namespace gcn
         iter = std::find(mWidgets.begin(), mWidgets.end(), event.getSource());
 
         if (iter == mWidgets.end())
-            throw GCN_EXCEPTION("There is no such widget in this container.");
+            return;
 
         mWidgets.erase(iter);
     }
 
-    Rectangle BasicContainer::getChildrenArea()
+    Rect BasicContainer::getChildrenArea()
     {
-        return Rectangle(0, 0, getWidth(), getHeight());
+        return Rect(0, 0, getWidth(), getHeight());
     }
 
     void BasicContainer::focusNext()
@@ -190,7 +182,7 @@ namespace gcn
 
     Widget *BasicContainer::getWidgetAt(int x, int y)
     {
-        const Rectangle r = getChildrenArea();
+        const Rect r = getChildrenArea();
 
         if (!r.isPointInRect(x, y))
             return nullptr;
@@ -259,8 +251,6 @@ namespace gcn
                 return;
             }
         }
-
-        throw GCN_EXCEPTION("There is no such widget in this container.");
     }
 
     void BasicContainer::clear()
@@ -292,7 +282,7 @@ namespace gcn
                 // draw it before drawing the widget
                 if (widget->getFrameSize() > 0)
                 {
-                    Rectangle rec = widget->getDimension();
+                    Rect rec = widget->getDimension();
                     const int frame = widget->getFrameSize();
                     const int frame2 = frame * 2;
                     rec.x -= frame;
@@ -329,9 +319,9 @@ namespace gcn
         BLOCK_END("BasicContainer::logicChildren")
     }
 
-    void BasicContainer::showWidgetPart(Widget* widget, Rectangle area)
+    void BasicContainer::showWidgetPart(Widget* widget, Rect area)
     {
-        const Rectangle widgetArea = getChildrenArea();
+        const Rect widgetArea = getChildrenArea();
 
         area.x += widget->getX();
         area.y += widget->getY();
diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/gui/base/basiccontainer.hpp
index a3fb18528..e1947c652 100644
--- a/src/guichan/include/guichan/basiccontainer.hpp
+++ b/src/gui/base/basiccontainer.hpp
@@ -64,11 +64,11 @@
 #ifndef GCN_BASICCONTAINER_HPP
 #define GCN_BASICCONTAINER_HPP
 
-#include <list>
 #include <vector>
 
-#include "guichan/deathlistener.hpp"
-#include "guichan/widget.hpp"
+#include "gui/widgets/widget.h"
+
+#include "listeners/deathlistener.h"
 
 namespace gcn
 {
@@ -84,7 +84,9 @@ namespace gcn
                            public DeathListener
     {
     public:
-        BasicContainer() :
+        explicit BasicContainer(const Widget2 *const widget) :
+            Widget(widget),
+            DeathListener(),
             mWidgets()
         { }
 
@@ -106,7 +108,7 @@ namespace gcn
          *               itself to be visible.
          * @param rectangle The rectangle to be visible.
          */
-        virtual void showWidgetPart(Widget* widget, Rectangle area);
+        virtual void showWidgetPart(Widget* widget, Rect area);
 
         // Inherited from Widget
 
@@ -114,7 +116,7 @@ namespace gcn
 
         virtual void moveToBottom(Widget* widget);
 
-        virtual Rectangle getChildrenArea() A_WARN_UNUSED;
+        virtual Rect getChildrenArea() A_WARN_UNUSED;
 
         virtual void focusNext();
 
diff --git a/src/guichan/gui.cpp b/src/gui/base/gui.cpp
index fa50812de..8985ec062 100644
--- a/src/guichan/gui.cpp
+++ b/src/gui/base/gui.cpp
@@ -65,18 +65,16 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/gui.hpp"
-
-#include "guichan/basiccontainer.hpp"
-#include "guichan/exception.hpp"
-#include "guichan/focushandler.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/input.hpp"
-#include "guichan/keyinput.hpp"
-#include "guichan/keylistener.hpp"
-#include "guichan/mouseinput.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "gui/base/gui.hpp"
+
+#include "gui/widgets/widget.h"
+
+#include "gui/focushandler.h"
+
+#include "input/mouseinput.h"
+
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
 
 #include "debug.h"
 
@@ -137,12 +135,12 @@ namespace gcn
         return mGraphics;
     }
 
-    void Gui::setInput(Input* input)
+    void Gui::setInput(SDLInput* input)
     {
         mInput = input;
     }
 
-    Input* Gui::getInput() const
+    SDLInput* Gui::getInput() const
     {
         return mInput;
     }
@@ -530,7 +528,7 @@ namespace gcn
                             (*it)->mouseClicked(mouseEvent);
                             break;
                         default:
-                            throw GCN_EXCEPTION("Unknown mouse event type.");
+                            break;
                     }
                 }
 
@@ -606,7 +604,7 @@ namespace gcn
                             (*it)->keyReleased(keyEvent);
                             break;
                         default:
-                            throw GCN_EXCEPTION("Unknown key event type.");
+                            break;
                     }
                 }
             }
@@ -639,7 +637,7 @@ namespace gcn
                     (*it)->keyReleased(keyEvent);
                     break;
                 default:
-                    throw GCN_EXCEPTION("Unknown key event type.");
+                    break;
             }
 
             if (keyEvent.isConsumed())
diff --git a/src/guichan/include/guichan/gui.hpp b/src/gui/base/gui.hpp
index 5aca51f4e..4ea923400 100644
--- a/src/guichan/include/guichan/gui.hpp
+++ b/src/gui/base/gui.hpp
@@ -67,18 +67,19 @@
 #include <list>
 #include <deque>
 
-#include "guichan/keyevent.hpp"
-#include "guichan/mouseevent.hpp"
-#include "guichan/mouseinput.hpp"
+#include "localconsts.h"
+
+class Event;
+class FocusHandler;
+class Graphics;
+class KeyEvent;
+class KeyListener;
+class MouseInput;
+class SDLInput;
+class Widget;
 
 namespace gcn
 {
-    class FocusHandler;
-    class Graphics;
-    class Input;
-    class KeyListener;
-    class Widget;
-
     // The following comment will appear in the doxygen main page.
     /**
      * @mainpage
@@ -176,7 +177,7 @@ namespace gcn
          *      SDLInput
          * @since 0.1.0
          */
-        virtual void setInput(Input* input);
+        virtual void setInput(SDLInput* input);
 
         /**
          * Gets the input object being used for input handling.
@@ -187,7 +188,7 @@ namespace gcn
          *      SDLInput
          * @since 0.1.0
          */
-        virtual Input* getInput() const A_WARN_UNUSED;
+        virtual SDLInput* getInput() const A_WARN_UNUSED;
 
         /**
          * Performs logic of the GUI. By calling this function all logic
@@ -416,7 +417,7 @@ namespace gcn
         /**
          * Holds the input implementation used.
          */
-        Input* mInput;
+        SDLInput* mInput;
 
         /**
          * Holds the focus handler for the Gui.
diff --git a/src/guichan/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 1226e157a..2d6afa672 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -65,24 +65,21 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/button.hpp"
+#include "gui/base/widgets/button.hpp"
 
-#include "guichan/exception.hpp"
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/mouseevent.hpp"
-#include "guichan/mouseinput.hpp"
+#include "events/mouseevent.h"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 namespace gcn
 {
-    Button::Button() :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
-        gcn::FocusListener(),
+    Button::Button(const Widget2 *const widget) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
+        FocusListener(),
         mCaption(),
         mHasMouse(false),
         mKeyPressed(false),
@@ -99,11 +96,12 @@ namespace gcn
         addFocusListener(this);
     }
 
-    Button::Button(const std::string& caption) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
-        gcn::FocusListener(),
+    Button::Button(const Widget2 *const widget,
+                   const std::string& caption) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
+        FocusListener(),
         mCaption(caption),
         mHasMouse(false),
         mKeyPressed(false),
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index 91c526d4f..99e5db4f4 100644
--- a/src/guichan/include/guichan/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -66,12 +66,13 @@
 
 #include <string>
 
-#include "guichan/focuslistener.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/keylistener.hpp"
-#include "guichan/mouseevent.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "listeners/focuslistener.h"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
+
+#include "render/graphics.h"
 
 namespace gcn
 {
@@ -93,7 +94,7 @@ namespace gcn
         /**
          * Constructor.
          */
-        Button();
+        explicit Button(const Widget2 *const widget);
 
         /**
          * Constructor. The button will be automatically resized
@@ -101,7 +102,8 @@ namespace gcn
          *
          * @param caption The caption of the button.
          */
-        explicit Button(const std::string& caption);
+        Button(const Widget2 *const widget,
+               const std::string& caption);
 
         A_DELETE_COPY(Button)
 
diff --git a/src/guichan/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index 4b3c7b966..476fb3c6b 100644
--- a/src/guichan/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -65,22 +65,17 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/checkbox.hpp"
-
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/mouseinput.hpp"
+#include "gui/base/widgets/checkbox.hpp"
 
 #include "debug.h"
 
 namespace gcn
 {
 
-    CheckBox::CheckBox() :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    CheckBox::CheckBox(const Widget2 *const widget) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mSelected(false),
         mCaption()
     {
@@ -89,10 +84,12 @@ namespace gcn
         addKeyListener(this);
     }
 
-    CheckBox::CheckBox(const std::string &caption, bool selected) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    CheckBox::CheckBox(const Widget2 *const widget,
+                       const std::string &caption,
+                       bool selected) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mSelected(selected),
         mCaption()
     {
diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
index 465de566d..6fcb04767 100644
--- a/src/guichan/include/guichan/widgets/checkbox.hpp
+++ b/src/gui/base/widgets/checkbox.hpp
@@ -66,9 +66,10 @@
 
 #include <string>
 
-#include "guichan/keylistener.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
@@ -89,7 +90,7 @@ namespace gcn
         /**
          * Contructor.
          */
-        CheckBox();
+        explicit CheckBox(const Widget2 *const widget);
 
         /**
          * Constructor. The check box will be automatically resized
@@ -98,7 +99,9 @@ namespace gcn
          * @param caption The caption of the check box.
          * @param marked True if the check box is selected, false otherwise.
          */
-        CheckBox(const std::string &caption, bool selected = false);
+        CheckBox(const Widget2 *const widget,
+                 const std::string &caption,
+                 bool selected = false);
 
         A_DELETE_COPY(CheckBox)
 
diff --git a/src/guichan/widgets/container.cpp b/src/gui/base/widgets/container.cpp
index 7ea07e529..53a900ec4 100644
--- a/src/guichan/widgets/container.cpp
+++ b/src/gui/base/widgets/container.cpp
@@ -65,18 +65,18 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/container.hpp"
+#include "gui/base/widgets/container.hpp"
 
-#include "guichan/exception.hpp"
-#include "guichan/graphics.hpp"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 namespace gcn
 {
 
-    Container::Container() :
-        BasicContainer(),
+    Container::Container(const Widget2 *const widget) :
+        BasicContainer(widget),
         mOpaque(true)
     {
     }
@@ -91,7 +91,7 @@ namespace gcn
         if (isOpaque())
         {
             graphics->setColor(getBaseColor());
-            graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight()));
+            graphics->fillRectangle(Rect(0, 0, getWidth(), getHeight()));
         }
 
         drawChildren(graphics);
diff --git a/src/guichan/include/guichan/widgets/container.hpp b/src/gui/base/widgets/container.hpp
index b6efbf361..3e6c0a587 100644
--- a/src/guichan/include/guichan/widgets/container.hpp
+++ b/src/gui/base/widgets/container.hpp
@@ -64,10 +64,7 @@
 #ifndef GCN_CONTAINER_HPP
 #define GCN_CONTAINER_HPP
 
-#include <list>
-
-#include "guichan/basiccontainer.hpp"
-#include "guichan/graphics.hpp"
+#include "gui/base/basiccontainer.hpp"
 
 namespace gcn
 {
@@ -88,7 +85,7 @@ namespace gcn
          *
          * @see setOpaque, isOpaque
          */
-        Container();
+        explicit Container(const Widget2 *const widget);
 
         /**
          * Destructor.
diff --git a/src/guichan/widgets/label.cpp b/src/gui/base/widgets/label.cpp
index 92962e907..d2293a957 100644
--- a/src/guichan/widgets/label.cpp
+++ b/src/gui/base/widgets/label.cpp
@@ -65,25 +65,26 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/label.hpp"
+#include "gui/base/widgets/label.hpp"
 
-#include "guichan/exception.hpp"
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
+#include "gui/font.h"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 namespace gcn
 {
-    Label::Label() :
-        gcn::Widget(),
+    Label::Label(const Widget2 *const widget) :
+        Widget(widget),
         mCaption(),
         mAlignment(Graphics::LEFT)
     {
     }
 
-    Label::Label(const std::string& caption) :
-        gcn::Widget(),
+    Label::Label(const Widget2 *const widget,
+                 const std::string& caption) :
+        Widget(widget),
         mCaption(caption),
         mAlignment(Graphics::LEFT)
     {
diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/gui/base/widgets/label.hpp
index a8c2ae7ea..fd0d54f8e 100644
--- a/src/guichan/include/guichan/widgets/label.hpp
+++ b/src/gui/base/widgets/label.hpp
@@ -66,8 +66,9 @@
 
 #include <string>
 
-#include "guichan/graphics.hpp"
-#include "guichan/widget.hpp"
+#include "gui/widgets/widget.h"
+
+#include "render/graphics.h"
 
 namespace gcn
 {
@@ -80,7 +81,7 @@ namespace gcn
         /**
          * Constructor.
          */
-        Label();
+        explicit Label(const Widget2 *const widget);
 
         /**
          * Constructor. The label will be automatically resized
@@ -88,7 +89,8 @@ namespace gcn
          *
          * @param caption The caption of the label.
          */
-        explicit Label(const std::string& caption);
+        Label(const Widget2 *const widget,
+              const std::string& caption);
 
         A_DELETE_COPY(Label)
 
diff --git a/src/guichan/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 9122e8cc8..2e9606f0a 100644
--- a/src/guichan/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -65,24 +65,22 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/listbox.hpp"
+#include "gui/base/widgets/listbox.hpp"
 
-#include "guichan/basiccontainer.hpp"
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/listmodel.hpp"
-#include "guichan/mouseinput.hpp"
-#include "guichan/selectionlistener.hpp"
+#include "gui/font.h"
+
+#include "gui/models/listmodel.h"
+
+#include "listeners/selectionlistener.h"
 
 #include "debug.h"
 
 namespace gcn
 {
-    ListBox::ListBox() :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    ListBox::ListBox(const Widget2 *const widget) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mSelected(-1),
         mListModel(nullptr),
         mWrappingEnabled(false),
@@ -95,10 +93,11 @@ namespace gcn
         addKeyListener(this);
     }
 
-    ListBox::ListBox(ListModel *listModel) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    ListBox::ListBox(const Widget2 *const widget,
+                     ListModel *listModel) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mSelected(-1),
         mListModel(listModel),
         mWrappingEnabled(false),
@@ -140,7 +139,7 @@ namespace gcn
                 mSelected = selected;
         }
 
-        Rectangle scroll;
+        Rect scroll;
 
         if (mSelected < 0)
             scroll.y = 0;
diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index d28664455..079e5a7d5 100644
--- a/src/guichan/include/guichan/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -66,15 +66,16 @@
 
 #include <list>
 
-#include "guichan/keylistener.hpp"
-#include "guichan/listmodel.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "gui/widgets/widget.h"
+
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+class ListModel;
+class SelectionListener;
 
 namespace gcn
 {
-    class SelectionListener;
-
     /**
      * An implementation of a list box where an item can be selected.
      *
@@ -95,14 +96,15 @@ namespace gcn
         /**
          * Constructor.
          */
-        ListBox();
+        explicit ListBox(const Widget2 *const widget);
 
         /**
          * Constructor.
          *
          * @param listModel the list model to use.
          */
-        explicit ListBox(ListModel *listModel);
+        ListBox(const Widget2 *const widget,
+                ListModel *listModel);
 
         A_DELETE_COPY(ListBox)
 
diff --git a/src/guichan/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index 26ce731ed..f9d68555a 100644
--- a/src/guichan/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -65,12 +65,7 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/radiobutton.hpp"
-
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/mouseinput.hpp"
+#include "gui/base/widgets/radiobutton.hpp"
 
 #include "debug.h"
 
@@ -78,10 +73,10 @@ namespace gcn
 {
     RadioButton::GroupMap RadioButton::mGroupMap;
 
-    RadioButton::RadioButton() :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    RadioButton::RadioButton(const Widget2 *const widget) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mSelected(false),
         mCaption(),
         mGroup()
@@ -93,12 +88,13 @@ namespace gcn
         addKeyListener(this);
     }
 
-    RadioButton::RadioButton(const std::string &caption,
+    RadioButton::RadioButton(const Widget2 *const widget,
+                             const std::string &caption,
                              const std::string &group,
                              bool selected) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mSelected(false),
         mCaption(),
         mGroup()
diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp
index 2a93a82ee..a86a4eed3 100644
--- a/src/guichan/include/guichan/widgets/radiobutton.hpp
+++ b/src/gui/base/widgets/radiobutton.hpp
@@ -67,9 +67,10 @@
 #include <map>
 #include <string>
 
-#include "guichan/keylistener.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
@@ -92,7 +93,7 @@ namespace gcn
         /**
          * Constructor.
          */
-        RadioButton();
+        explicit RadioButton(const Widget2 *const widget);
 
         /**
          * Constructor. The radio button will be automatically resized
@@ -102,7 +103,8 @@ namespace gcn
          * @param group The group the radio button should belong to.
          * @param selected True if the radio button should be selected.
          */
-        RadioButton(const std::string &caption,
+        RadioButton(const Widget2 *const widget,
+                    const std::string &caption,
                     const std::string &group,
                     bool selected = false);
 
diff --git a/src/guichan/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp
index ddc4405e2..665830ce4 100644
--- a/src/guichan/widgets/scrollarea.cpp
+++ b/src/gui/base/widgets/scrollarea.cpp
@@ -65,18 +65,15 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/scrollarea.hpp"
-
-#include "guichan/exception.hpp"
-#include "guichan/graphics.hpp"
+#include "gui/base/widgets/scrollarea.hpp"
 
 #include "debug.h"
 
 namespace gcn
 {
-    ScrollArea::ScrollArea() :
-        gcn::BasicContainer(),
-        gcn::MouseListener(),
+    ScrollArea::ScrollArea(const Widget2 *const widget) :
+        gcn::BasicContainer(widget),
+        MouseListener(),
         mVScroll(0),
         mHScroll(0),
         mScrollbarWidth(12),
@@ -101,9 +98,10 @@ namespace gcn
         addMouseListener(this);
     }
 
-    ScrollArea::ScrollArea(Widget *const content) :
-        gcn::BasicContainer(),
-        gcn::MouseListener(),
+    ScrollArea::ScrollArea(const Widget2 *const widget,
+                           Widget *const content) :
+        gcn::BasicContainer(widget),
+        MouseListener(),
         mVScroll(0),
         mHScroll(0),
         mScrollbarWidth(12),
@@ -129,11 +127,12 @@ namespace gcn
         addMouseListener(this);
     }
 
-    ScrollArea::ScrollArea(Widget *content,
+    ScrollArea::ScrollArea(const Widget2 *const widget,
+                           Widget *content,
                            ScrollPolicy hPolicy,
                            ScrollPolicy vPolicy) :
-        gcn::BasicContainer(),
-        gcn::MouseListener(),
+        gcn::BasicContainer(widget),
+        MouseListener(),
         mVScroll(0),
         mHScroll(0),
         mScrollbarWidth(12),
@@ -299,8 +298,6 @@ namespace gcn
     {
         if (width > 0)
             mScrollbarWidth = width;
-        else
-            throw GCN_EXCEPTION("Width should be greater then 0.");
     }
 
     int ScrollArea::getScrollbarWidth() const
@@ -445,7 +442,7 @@ namespace gcn
                 break;
 
             default:
-                throw GCN_EXCEPTION("Horizontal scroll policy invalid.");
+                break;
         }
 
         switch (mVPolicy)
@@ -470,27 +467,27 @@ namespace gcn
                 }
                 break;
             default:
-                throw GCN_EXCEPTION("Vertical scroll policy invalid.");
+                break;
         }
     }
 
-    Rectangle ScrollArea::getChildrenArea()
+    Rect ScrollArea::getChildrenArea()
     {
-        const Rectangle area = Rectangle(0, 0,
+        const Rect area = Rect(0, 0,
             mVBarVisible ? (getWidth() - mScrollbarWidth) : getWidth(),
             mHBarVisible ? (getHeight() - mScrollbarWidth) : getHeight());
 
         if (area.width < 0 || area.height < 0)
-            return Rectangle();
+            return Rect();
 
         return area;
     }
 
-    void ScrollArea::showWidgetPart(Widget* widget, Rectangle area)
+    void ScrollArea::showWidgetPart(Widget* widget, Rect area)
     {
         const Widget *const content = getContent();
         if (widget != content)
-            throw GCN_EXCEPTION("Widget not content widget");
+            return;
 
         BasicContainer::showWidgetPart(widget, area);
 
@@ -542,7 +539,7 @@ namespace gcn
         checkPolicies();
     }
 
-    void ScrollArea::setDimension(const Rectangle& dimension)
+    void ScrollArea::setDimension(const Rect& dimension)
     {
         Widget::setDimension(dimension);
         checkPolicies();
diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/gui/base/widgets/scrollarea.hpp
index 30fa64abc..879792019 100644
--- a/src/guichan/include/guichan/widgets/scrollarea.hpp
+++ b/src/gui/base/widgets/scrollarea.hpp
@@ -64,10 +64,8 @@
 #ifndef GCN_SCROLLAREA_HPP
 #define GCN_SCROLLAREA_HPP
 
-#include <string>
-
-#include "guichan/basiccontainer.hpp"
-#include "guichan/mouselistener.hpp"
+#include "gui/base/basiccontainer.hpp"
+#include "listeners/mouselistener.h"
 
 namespace gcn
 {
@@ -100,14 +98,15 @@ namespace gcn
         /**
          * Constructor.
          */
-        ScrollArea();
+        explicit ScrollArea(const Widget2 *const widget);
 
         /**
          * Constructor.
          *
          * @param content The content of the scroll area.
          */
-        explicit ScrollArea(Widget *const content);
+        ScrollArea(const Widget2 *const widget,
+                   Widget *const content);
 
         /**
          * Constructor.
@@ -118,7 +117,8 @@ namespace gcn
          * @param vPolicy The policy for the vertical scrollbar. See enum with
          *                policies.
          */
-        ScrollArea(Widget *content,
+        ScrollArea(const Widget2 *const widget,
+                   Widget *content,
                    ScrollPolicy hPolicy,
                    ScrollPolicy vPolicy);
 
@@ -345,9 +345,9 @@ namespace gcn
 
         // Inherited from BasicContainer
 
-        virtual void showWidgetPart(Widget* widget, Rectangle area);
+        virtual void showWidgetPart(Widget* widget, Rect area);
 
-        virtual Rectangle getChildrenArea();
+        virtual Rect getChildrenArea();
 
         virtual Widget *getWidgetAt(int x, int y);
 
@@ -362,7 +362,7 @@ namespace gcn
 
         void setHeight(int height);
 
-        void setDimension(const Rectangle& dimension);
+        void setDimension(const Rect& dimension);
 
 
         // Inherited from MouseListener
diff --git a/src/guichan/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index 849101fd8..40c73ceb5 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -65,20 +65,17 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/slider.hpp"
-
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/mouseinput.hpp"
+#include "gui/base/widgets/slider.hpp"
 
 #include "debug.h"
 
 namespace gcn
 {
-    Slider::Slider(const double scaleEnd) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    Slider::Slider(const Widget2 *const widget,
+                   const double scaleEnd) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mDragged(false),
         mValue(0),
         mStepLength(scaleEnd / 10),
@@ -94,10 +91,12 @@ namespace gcn
         addKeyListener(this);
     }
 
-    Slider::Slider(const double scaleStart, const double scaleEnd) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    Slider::Slider(const Widget2 *const widget,
+                   const double scaleStart,
+                   const double scaleEnd) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mDragged(false),
         mValue(scaleStart),
         mStepLength((scaleEnd - scaleStart) / 10),
diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/gui/base/widgets/slider.hpp
index 04f774b21..9d5adc6d8 100644
--- a/src/guichan/include/guichan/widgets/slider.hpp
+++ b/src/gui/base/widgets/slider.hpp
@@ -64,9 +64,10 @@
 #ifndef GCN_SLIDER_HPP
 #define GCN_SLIDER_HPP
 
-#include "guichan/keylistener.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
@@ -98,7 +99,8 @@ namespace gcn
          *
          * @param scaleEnd The end value of the slider scale.
          */
-        explicit Slider(const double scaleEnd = 1.0);
+        explicit Slider(const Widget2 *const widget,
+                        const double scaleEnd = 1.0);
 
         /**
          * Constructor.
@@ -106,7 +108,9 @@ namespace gcn
          * @param scaleStart The start value of the slider scale.
          * @param scaleEnd The end value of the slider scale.
          */
-        Slider(const double scaleStart, const double scaleEnd);
+        Slider(const Widget2 *const widget,
+               const double scaleStart,
+               const double scaleEnd);
 
         A_DELETE_COPY(Slider)
 
diff --git a/src/guichan/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index e3bfd39f5..f74db9a29 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -65,22 +65,20 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/textbox.hpp"
+#include "gui/base/widgets/textbox.hpp"
 
-#include "guichan/basiccontainer.hpp"
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/mouseinput.hpp"
+#include "gui/font.h"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 namespace gcn
 {
-    TextBox::TextBox() :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    TextBox::TextBox(const Widget2 *const widget) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mTextRows(),
         mCaretColumn(0),
         mCaretRow(0),
@@ -95,10 +93,11 @@ namespace gcn
         adjustSize();
     }
 
-    TextBox::TextBox(const std::string& text) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    TextBox::TextBox(const Widget2 *const widget,
+                     const std::string& text) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mTextRows(),
         mCaretColumn(0),
         mCaretRow(0),
@@ -305,7 +304,7 @@ namespace gcn
 
     void TextBox::scrollToCaret()
     {
-        Rectangle scroll;
+        Rect scroll;
         scroll.x = getFont()->getWidth(
             mTextRows[mCaretRow].substr(0, mCaretColumn));
         scroll.y = getFont()->getHeight() * mCaretRow;
diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp
index a75b52115..148b4f007 100644
--- a/src/guichan/include/guichan/widgets/textbox.hpp
+++ b/src/gui/base/widgets/textbox.hpp
@@ -64,13 +64,13 @@
 #ifndef GCN_TEXTBOX_HPP
 #define GCN_TEXTBOX_HPP
 
-#include <ctime>
 #include <string>
 #include <vector>
 
-#include "guichan/keylistener.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
@@ -86,14 +86,15 @@ namespace gcn
         /**
          * Constructor.
          */
-        TextBox();
+        explicit TextBox(const Widget2 *const widget);
 
         /**
          * Constructor.
          *
          * @param text The default text of the text box.
          */
-        explicit TextBox(const std::string& text);
+        TextBox(const Widget2 *const widget,
+                const std::string& text);
 
         A_DELETE_COPY(TextBox)
 
diff --git a/src/guichan/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index 1e4309266..c2cead500 100644
--- a/src/guichan/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -65,21 +65,18 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/widgets/textfield.hpp"
+#include "gui/base/widgets/textfield.hpp"
 
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/key.hpp"
-#include "guichan/mouseinput.hpp"
+#include "gui/font.h"
 
 #include "debug.h"
 
 namespace gcn
 {
-    TextField::TextField() :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    TextField::TextField(const Widget2 *const widget) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mText(),
         mCaretPosition(0),
         mXScroll(0)
@@ -90,10 +87,11 @@ namespace gcn
         addKeyListener(this);
     }
 
-    TextField::TextField(const std::string& text) :
-        gcn::Widget(),
-        gcn::MouseListener(),
-        gcn::KeyListener(),
+    TextField::TextField(const Widget2 *const widget,
+                         const std::string& text) :
+        Widget(widget),
+        MouseListener(),
+        KeyListener(),
         mText(text),
         mCaretPosition(0),
         mXScroll(0)
diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/gui/base/widgets/textfield.hpp
index b1293045f..e9df238ba 100644
--- a/src/guichan/include/guichan/widgets/textfield.hpp
+++ b/src/gui/base/widgets/textfield.hpp
@@ -64,9 +64,10 @@
 #ifndef GCN_TEXTFIELD_HPP
 #define GCN_TEXTFIELD_HPP
 
-#include "guichan/keylistener.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widget.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 #include <string>
 
@@ -84,7 +85,7 @@ namespace gcn
         /**
          * Constructor.
          */
-        TextField();
+        explicit TextField(const Widget2 *const widget);
 
         /**
          * Constructor. The text field will be automatically resized
@@ -92,7 +93,8 @@ namespace gcn
          *
          * @param text The default text of the text field.
          */
-        explicit TextField(const std::string& text);
+        TextField(const Widget2 *const widget,
+                  const std::string& text);
 
         A_DELETE_COPY(TextField)
 
diff --git a/src/guichan/image.cpp b/src/gui/cliprect.cpp
index d60df27a7..5255a4c98 100644
--- a/src/guichan/image.cpp
+++ b/src/gui/cliprect.cpp
@@ -65,19 +65,40 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/image.hpp"
-
-#include "guichan/exception.hpp"
+#include "gui/cliprect.h"
 
 #include "debug.h"
 
-namespace gcn
+ClipRect::ClipRect() :
+    Rect(),
+    xOffset(0),
+    yOffset(0)
+{
+    x = 0;
+    y = 0;
+    width = 0;
+    height = 0;
+}
+
+ClipRect::ClipRect(const int x0, const int y0,
+                   const int width0, const int height0,
+                   const int xOffset0, const int yOffset0) :
+    Rect(),
+    xOffset(xOffset0),
+    yOffset(yOffset0)
+{
+    x = x0;
+    y = y0;
+    width = width0;
+    height = height0;
+}
+
+const ClipRect& ClipRect::operator=(const Rect& other)
 {
-    Image::Image()
-    {
-    }
+    x = other.x;
+    y = other.y;
+    width = other.width;
+    height = other.height;
 
-    Image::~Image()
-    {
-    }
+    return *this;
 }
diff --git a/src/guichan/include/guichan/input.hpp b/src/gui/cliprect.h
index 71a15ce85..88a7ab5a4 100644
--- a/src/guichan/include/guichan/input.hpp
+++ b/src/gui/cliprect.h
@@ -61,74 +61,66 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_INPUT_HPP
-#define GCN_INPUT_HPP
+#ifndef GUI_CLIPRECT_H
+#define GUI_CLIPRECT_H
+
+#include "gui/rect.h"
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * A rectangle used when dealing with clipping. A clip rectangle is
+  * a regular rectangle extended with variables for x offsets and y 
+  * offsets. The offsets are used for calculations from relative
+  * screen coordinates to actual screen coordinates.
+  */
+class ClipRect final : public Rect
 {
-    class KeyInput;
-    class MouseInput;
-
-    /**
-     * Abstract class for providing functions for user input. 
-     *
-     * Guichan contains implementations of Input for common 
-     * libraries like the Allegro library, the HGE library, 
-     * and the SDL library. 
-     * To make Guichan usable with other libraries, an Input 
-     * class must be implemented.
-     *
-     * @see AllegroInput, HGEInput, OpenLayerInput, 
-     *      SDLInput
-     */
-    class Input
-    {
     public:
         /**
-         * Destructor.
-         */
-        virtual ~Input(){ }
-
-        /**
-         * Checks if the key queue is empty, or not.
-         *
-         * @return True if the key queue is empty, 
-         *         false otherwise.
-         */
-        virtual bool isKeyQueueEmpty() A_WARN_UNUSED = 0;
+          * Constructor.
+          */
+        ClipRect();
 
         /**
-         * Dequeues the key input queue.
-         *
-         * @return The first key input in the key input queue.
-         */
-        virtual KeyInput dequeueKeyInput() = 0;
+          * Constructor.
+          *
+          * @param x0 The rectangle x coordinate.
+          * @param y0 The rectangle y coordinate.
+          * @param width0 The rectangle width.
+          * @param height0 The rectangle height.
+          * @param xOffset0 The offset of the x coordinate. Used to for
+          *                 calculating the actual screen coordinate from
+          *                 the relative screen coordinate.
+          * @param yOffset0 The offset of the y coordinate. Used to for
+          *                 calculating the actual screen coordinate from
+          *                 the relative screen coordinate.
+          */
+        ClipRect(const int x0,
+                 const int y0,
+                 const int width0,
+                 const int height0,
+                 const int xOffset0,
+                 const int yOffset0);
 
         /**
-         * Checks if the mouse queue is empyt, or not.
-         *
-         * @return True if the mouse queue is empty,
-         *         false otherwise.
-         */
-        virtual bool isMouseQueueEmpty() A_WARN_UNUSED = 0;
+          * Copy constructor. Copies x, y, width and height 
+          * field from a rectangle to a clip rectangle.
+          *
+          * @param other The rectangle to copy data from.
+          * @returns A clip rectangle with data copyied from a rectangle.
+          */
+        const ClipRect& operator=(const Rect& other);
 
         /**
-         * Dequeues the mouse input queue.
-         *
-         * @return The first mouse input in the mouse input queue.
-         */
-        virtual MouseInput dequeueMouseInput() = 0;
+          * Holds the x offset of the x coordinate.
+          */
+        int xOffset;
 
         /**
-         * Polls all exsisting input. Called when input should
-         * be polled. The function exists for compatibility reason
-         * where some libraries need to poll input at a certain
-         * logic rate.
-         */
-        virtual void _pollInput() = 0;
-    };
-}  // namespace gcn
+          * Holds the y offset of the y coordinate.
+          */
+        int yOffset;
+};
 
-#endif  // end GCN_INPUT_HPP
+#endif  // GUI_CLIPRECT_H
diff --git a/src/guichan/keyinput.cpp b/src/gui/color.cpp
index a18113c8d..aa9ffe840 100644
--- a/src/guichan/keyinput.cpp
+++ b/src/gui/color.cpp
@@ -65,90 +65,101 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/keyinput.hpp"
+#include "gui/color.h"
 
 #include "debug.h"
 
-namespace gcn
+Color::Color() :
+    r(0U),
+    g(0U),
+    b(0U),
+    a(255U)
 {
-    KeyInput::KeyInput(const Key& key, unsigned int type) :
-             mKey(key),
-             mType(type),
-             mShiftPressed(false),
-             mControlPressed(false),
-             mAltPressed(false),
-             mMetaPressed(false),
-             mNumericPad(false)
-    {
-    }
-
-    void KeyInput::setType(unsigned int type)
-    {
-        mType = type;
-    }
-
-    int KeyInput::getType() const
-    {
-        return mType;
-    }
-
-    void KeyInput::setKey(const Key& key)
-    {
-        mKey = key;
-    }
-
-    const Key& KeyInput::getKey() const
-    {
-        return mKey;
-    }
-
-    bool KeyInput::isShiftPressed() const
-    {
-        return mShiftPressed;
-    }
-
-    void KeyInput::setShiftPressed(bool pressed)
-    {
-        mShiftPressed = pressed;
-    }
-
-    bool KeyInput::isControlPressed() const
-    {
-        return mControlPressed;
-    }
-
-    void KeyInput::setControlPressed(bool pressed)
-    {
-        mControlPressed = pressed;
-    }
-
-    bool KeyInput::isAltPressed() const
-    {
-        return mAltPressed;
-    }
-
-    void KeyInput::setAltPressed(bool pressed)
-    {
-        mAltPressed = pressed;
-    }
-
-    bool KeyInput::isMetaPressed() const
-    {
-        return mMetaPressed;
-    }
-
-    void KeyInput::setMetaPressed(bool pressed)
-    {
-        mMetaPressed = pressed;
-    }
-
-    bool KeyInput::isNumericPad() const
-    {
-        return mNumericPad;
-    }
-
-    void KeyInput::setNumericPad(bool numpad)
-    {
-        mNumericPad = numpad;
-    }
-}  // namespace gcn
+}
+
+Color::Color(const unsigned int color) :
+    r((color >> 16) & 0xFF),
+    g((color >>  8) & 0xFF),
+    b(color         & 0xFF),
+    a(255U)
+{
+}
+
+Color::Color(const unsigned int ar,
+             const unsigned int ag,
+             const unsigned int ab,
+             const unsigned int aa) :
+    r(ar),
+    g(ag),
+    b(ab),
+    a(aa)
+{
+}
+
+Color Color::operator+(const Color& color) const
+{
+    Color result(r + color.r,
+                  g + color.g,
+                  b + color.b,
+                  255U);
+
+    result.r = (result.r > 255U ? 255U : result.r);
+    result.g = (result.g > 255U ? 255U : result.g);
+    result.b = (result.b > 255U ? 255U : result.b);
+
+    return result;
+}
+
+Color Color::operator-(const Color& color) const
+{
+    Color result(r - color.r,
+                  g - color.g,
+                  b - color.b,
+                  255U);
+
+    result.r = (result.r > 255U ? 255U : result.r);
+    result.g = (result.g > 255U ? 255U : result.g);
+    result.b = (result.b > 255U ? 255U : result.b);
+
+    return result;
+}
+
+Color Color::operator*(const float value) const
+{
+    Color result(static_cast<int>(static_cast<float>(r) * value),
+                  static_cast<int>(static_cast<float>(g) * value),
+                  static_cast<int>(static_cast<float>(b) * value),
+                  a);
+
+    result.r = (result.r > 255U ? 255U : result.r);
+    result.g = (result.g > 255U ? 255U : result.g);
+    result.b = (result.b > 255U ? 255U : result.b);
+
+    return result;
+}
+
+bool Color::operator==(const Color& color) const
+{
+    return r == color.r && g == color.g && b == color.b && a == color.a;
+}
+
+bool Color::operator!=(const Color& color) const
+{
+    return !(r == color.r && g == color.g && b == color.b && a == color.a);
+}
+
+std::ostream& operator<<(std::ostream& out,
+                         const Color& color)
+{
+    out << "Color [r = "
+        << color.r
+        << ", g = "
+        << color.g
+        << ", b = "
+        << color.b
+        << ", a = "
+        << color.a
+        << "]";
+
+    return out;
+}
diff --git a/src/guichan/include/guichan/color.hpp b/src/gui/color.h
index c32adb2e9..db8fda970 100644
--- a/src/guichan/include/guichan/color.hpp
+++ b/src/gui/color.h
@@ -61,132 +61,133 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_COLOR_HPP
-#define GCN_COLOR_HPP
+#ifndef GUI_COLOR_H
+#define GUI_COLOR_H
 
 #include <iostream>
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * Represents a color with red, green, blue and alpha components.
+  */
+class Color final
 {
-    /**
-     * Represents a color with red, green, blue and alpha components.
-     */
-    class Color final
-    {
     public:
         /**
-         * Constructor. Initializes the color to black.
-         */
+          * Constructor. Initializes the color to black.
+          */
         Color();
 
         /**
-         * Constructor. Constructs a color from the bytes in an integer. 
-         * Call it with a hexadecimal constant for HTML-style color representation.
-         * The alpha component is 255 by default.
-         *
-         * EXAMPLE: Color(0xff50a0) constructs a very nice pinkish color.
-         *
-         * NOTE: Because of this constructor, integers will be automatically
-         *       casted to a color by your compiler.
-         *
-         * @param color The color to initialise the object with.
-         */
-        explicit Color(const int color);
+          * Constructor. Constructs a color from the bytes in an integer. 
+          * Call it with a hexadecimal constant for HTML-style color
+          * representation.
+          * The alpha component is 255 by default.
+          *
+          * EXAMPLE: Color(0xff50a0) constructs a very nice pinkish color.
+          *
+          * NOTE: Because of this constructor, integers will be automatically
+          *       casted to a color by your compiler.
+          *
+          * @param color The color to initialise the object with.
+          */
+        explicit Color(const unsigned int color);
 
         /**
-         * Constructor. The default alpha value is 255.
-         *
-         * @param r Red color component (range 0-255).
-         * @param g Green color component  (range 0-255).
-         * @param b Blue color component (range 0-255).
-         * @param a Alpha, used for transparency. A value of 0 means
-         *          totaly transparent, 255 is totaly opaque.
-         */
-        Color(const int r, const int g, const int b, const int a = 255);
+          * Constructor. The default alpha value is 255.
+          *
+          * @param r Red color component (range 0-255).
+          * @param g Green color component  (range 0-255).
+          * @param b Blue color component (range 0-255).
+          * @param a Alpha, used for transparency. A value of 0 means
+          *          totaly transparent, 255 is totaly opaque.
+          */
+        Color(const unsigned int r,
+              const unsigned int g,
+              const unsigned int b,
+              const unsigned int a = 255);
 
         /**
-         * Adds the RGB values of two colors together. The values will be
-         * clamped if they go out of range. 
-         *
-         * WARNING: This function will reset the alpha value of the
-         *          returned color to 255.
-         *
-         * @param color A color to add to this color.
-         * @return The added colors with an alpha value set to 255.
-         */
+          * Adds the RGB values of two colors together. The values will be
+          * clamped if they go out of range. 
+          *
+          * WARNING: This function will reset the alpha value of the
+          *          returned color to 255.
+          *
+          * @param color A color to add to this color.
+          * @return The added colors with an alpha value set to 255.
+          */
         Color operator+(const Color& color) const;
 
         /**
-         * Subtracts the RGB values of one color from another.
-         * The values will be clamped if they go out of range.
-         *
-         * WARNING: This function will reset the alpha value of the
-         *          returned color to 255.
-         *
-         * @param color A color to subtract from this color.
-         * @return The subtracted colors with an alpha value set to 255.
-         */
+          * Subtracts the RGB values of one color from another.
+          * The values will be clamped if they go out of range.
+          *
+          * WARNING: This function will reset the alpha value of the
+          *          returned color to 255.
+          *
+          * @param color A color to subtract from this color.
+          * @return The subtracted colors with an alpha value set to 255.
+          */
         Color operator-(const Color& color) const;
 
         /**
-         * Multiplies the RGB values of a color with a float value.
-         * The values will be clamped if they go out of range.
-         *
-         * @param value The value to multiply the color with.
-         * @return The multiplied colors. The alpha value will, unlike
-         *         the add and subtract operations, be multiplied as
-         *         well.
-         */
+          * Multiplies the RGB values of a color with a float value.
+          * The values will be clamped if they go out of range.
+          *
+          * @param value The value to multiply the color with.
+          * @return The multiplied colors. The alpha value will, unlike
+          *         the add and subtract operations, be multiplied as
+          *         well.
+          */
         Color operator*(const float value) const;
 
         /**
-         * Compares two colors.
-         *
-         * @return True if the two colors have the same RGBA components
-         *         false otherwise.
-         */
+          * Compares two colors.
+          *
+          * @return True if the two colors have the same RGBA components
+          *         false otherwise.
+          */
         bool operator==(const Color& color) const;
 
         /**
-         * Compares two colors.
-         *
-         * @return True if the two colors have different RGBA components,
-         *         false otherwise.
-         */
+          * Compares two colors.
+          *
+          * @return True if the two colors have different RGBA components,
+          *         false otherwise.
+          */
         bool operator!=(const Color& color) const;
 
         /**
-         * Output operator for output.
-         *
-         * @param out The stream to output to.
-         * @param color The color to output.
-         */
+          * Output operator for output.
+          *
+          * @param out The stream to output to.
+          * @param color The color to output.
+          */
         friend std::ostream& operator<<(std::ostream& out,
                                         const Color& Color);
 
         /**
-         * Holds the red color component (range 0-255).
-         */
-        int r;
+          * Holds the red color component (range 0-255).
+          */
+        unsigned int r;
 
         /**
-         *  Holds the green color component (range 0-255).
-         */
-        int g;
+          *  Holds the green color component (range 0-255).
+          */
+        unsigned int g;
 
         /**
-         *  Holds the blue color component (range 0-255).
-         */
-        int b;
+          *  Holds the blue color component (range 0-255).
+          */
+        unsigned int b;
 
         /**
-         * Holds the alpha color component. A value of 0 means totally
-         * transparent while a value of 255 is considered opaque.
-         */
-        int a;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_COLOR_HPP
+          * Holds the alpha color component. A value of 0 means totally
+          * transparent while a value of 255 is considered opaque.
+          */
+        unsigned int a;
+};
+
+#endif  // GUI_COLOR_H
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index cd780e12d..928b3b72e 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -20,15 +20,74 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gui/focushandler.h"
 
 #include "gui/gui.h"
 
 #include "gui/widgets/window.h"
 
+#include "listeners/focuslistener.h"
+
 #include "debug.h"
 
-void FocusHandler::requestModalFocus(gcn::Widget *widget)
+FocusHandler::FocusHandler() :
+    mWidgets(),
+    mFocusedWidget(nullptr),
+    mModalFocusedWidget(nullptr),
+    mModalMouseInputFocusedWidget(nullptr),
+    mDraggedWidget(nullptr),
+    mLastWidgetWithMouse(nullptr),
+    mLastWidgetWithModalFocus(nullptr),
+    mLastWidgetWithModalMouseInputFocus(nullptr),
+    mLastWidgetPressed(nullptr),
+    mModalStack()
+{
+}
+
+void FocusHandler::requestModalFocus(Widget *widget)
 {
     /* If there is another widget with modal focus, remove its modal focus
      * and put it on the modal widget stack.
@@ -39,45 +98,217 @@ void FocusHandler::requestModalFocus(gcn::Widget *widget)
         mModalFocusedWidget = nullptr;
     }
 
-    gcn::FocusHandler::requestModalFocus(widget);
+    mModalFocusedWidget = widget;
+    if (mFocusedWidget && !mFocusedWidget->isModalFocused())
+        focusNone();
 }
 
-void FocusHandler::releaseModalFocus(gcn::Widget *widget)
+void FocusHandler::releaseModalFocus(Widget *widget)
 {
     mModalStack.remove(widget);
 
     if (mModalFocusedWidget == widget)
     {
-        gcn::FocusHandler::releaseModalFocus(widget);
+        if (mModalFocusedWidget == widget)
+            mModalFocusedWidget = nullptr;
 
         /* Check if there were any previously modal widgets that'd still like
          * to regain their modal focus.
          */
         if (!mModalStack.empty())
         {
-            gcn::FocusHandler::requestModalFocus(mModalStack.front());
+            requestModalFocus(mModalStack.front());
             mModalStack.pop_front();
         }
     }
 }
 
-void FocusHandler::remove(gcn::Widget *widget)
+void FocusHandler::remove(Widget *widget)
 {
     releaseModalFocus(widget);
 
-    gcn::FocusHandler::remove(widget);
+    if (isFocused(widget))
+        mFocusedWidget = nullptr;
+
+    for (WidgetIterator iter = mWidgets.begin();
+          iter != mWidgets.end(); ++iter)
+    {
+        if ((*iter) == widget)
+        {
+            mWidgets.erase(iter);
+            break;
+        }
+    }
+
+    if (mDraggedWidget == widget)
+    {
+        mDraggedWidget = nullptr;
+        return;
+    }
+
+    if (mLastWidgetWithMouse == widget)
+    {
+        mLastWidgetWithMouse = nullptr;
+        return;
+    }
+
+    if (mLastWidgetWithModalFocus == widget)
+    {
+        mLastWidgetWithModalFocus = nullptr;
+        return;
+    }
+
+    if (mLastWidgetWithModalMouseInputFocus == widget)
+    {
+        mLastWidgetWithModalMouseInputFocus = nullptr;
+        return;
+    }
+
+    if (mLastWidgetPressed == widget)
+    {
+        mLastWidgetPressed = nullptr;
+        return;
+    }
 }
 
 void FocusHandler::tabNext()
 {
-    gcn::FocusHandler::tabNext();
+    if (mFocusedWidget)
+    {
+        if (!mFocusedWidget->isTabOutEnabled())
+            return;
+    }
+
+    if (mWidgets.empty())
+    {
+        mFocusedWidget = nullptr;
+        return;
+    }
+
+    int i;
+    int focusedWidget = -1;
+    const int sz = static_cast<int>(mWidgets.size());
+    for (i = 0; i < sz; ++ i)
+    {
+        if (mWidgets[i] == mFocusedWidget)
+            focusedWidget = i;
+    }
+    const int focused = focusedWidget;
+    bool done = false;
+
+    // i is a counter that ensures that the following loop
+    // won't get stuck in an infinite loop
+    i = sz;
+    do
+    {
+        ++ focusedWidget;
+
+        if (i == 0)
+        {
+            focusedWidget = -1;
+            break;
+        }
+
+        -- i;
+
+        if (focusedWidget >= sz)
+            focusedWidget = 0;
+
+        if (focusedWidget == focused)
+            return;
+
+        const Widget *const widget = mWidgets.at(focusedWidget);
+        if (widget->isFocusable() && widget->isTabInEnabled() &&
+            (!mModalFocusedWidget || widget->isModalFocused()))
+        {
+            done = true;
+        }
+    }
+    while (!done);
+
+    if (focusedWidget >= 0)
+    {
+        mFocusedWidget = mWidgets.at(focusedWidget);
+        Event focusEvent(mFocusedWidget);
+        distributeFocusGainedEvent(focusEvent);
+    }
+
+    if (focused >= 0)
+    {
+        Event focusEvent(mWidgets.at(focused));
+        distributeFocusLostEvent(focusEvent);
+    }
 
     checkForWindow();
 }
 
 void FocusHandler::tabPrevious()
 {
-    gcn::FocusHandler::tabPrevious();
+    if (mFocusedWidget)
+    {
+        if (!mFocusedWidget->isTabOutEnabled())
+            return;
+    }
+
+    if (mWidgets.empty())
+    {
+        mFocusedWidget = nullptr;
+        return;
+    }
+
+    int i;
+    int focusedWidget = -1;
+    const int sz = static_cast<int>(mWidgets.size());
+    for (i = 0; i < sz; ++ i)
+    {
+        if (mWidgets[i] == mFocusedWidget)
+            focusedWidget = i;
+    }
+    const int focused = focusedWidget;
+    bool done = false;
+
+    // i is a counter that ensures that the following loop
+    // won't get stuck in an infinite loop
+    i = sz;
+    do
+    {
+        -- focusedWidget;
+
+        if (i == 0)
+        {
+            focusedWidget = -1;
+            break;
+        }
+
+        -- i;
+
+        if (focusedWidget <= 0)
+            focusedWidget = sz - 1;
+
+        if (focusedWidget == focused)
+            return;
+
+        const Widget *const widget = mWidgets.at(focusedWidget);
+        if (widget->isFocusable() && widget->isTabInEnabled() &&
+            (!mModalFocusedWidget || widget->isModalFocused()))
+        {
+            done = true;
+        }
+    }
+    while (!done);
+
+    if (focusedWidget >= 0)
+    {
+        mFocusedWidget = mWidgets.at(focusedWidget);
+        Event focusEvent(mFocusedWidget);
+        distributeFocusGainedEvent(focusEvent);
+    }
+
+    if (focused >= 0)
+    {
+        Event focusEvent(mWidgets.at(focused));
+        distributeFocusLostEvent(focusEvent);
+    }
 
     checkForWindow();
 }
@@ -86,7 +317,7 @@ void FocusHandler::checkForWindow() const
 {
     if (mFocusedWidget)
     {
-        gcn::Widget *widget = mFocusedWidget->getParent();
+        Widget *widget = mFocusedWidget->getParent();
 
         while (widget)
         {
@@ -103,9 +334,284 @@ void FocusHandler::checkForWindow() const
     }
 }
 
-void FocusHandler::distributeFocusGainedEvent(const gcn::Event &focusEvent)
+void FocusHandler::distributeFocusGainedEvent(const Event &focusEvent)
 {
     if (gui)
         gui->distributeGlobalFocusGainedEvent(focusEvent);
-    gcn::FocusHandler::distributeFocusGainedEvent(focusEvent);
+
+    Widget *const sourceWidget = focusEvent.getSource();
+
+    std::list<FocusListener*> focusListeners
+        = sourceWidget->_getFocusListeners();
+
+    // Send the event to all focus listeners of the widget.
+    for (std::list<FocusListener*>::const_iterator
+          it = focusListeners.begin();
+          it != focusListeners.end();
+          ++ it)
+    {
+        (*it)->focusGained(focusEvent);
+    }
+}
+
+void FocusHandler::requestFocus(Widget* widget)
+{
+    if (!widget || widget == mFocusedWidget)
+        return;
+
+    int toBeFocusedIndex = -1;
+    for (unsigned int i = 0, sz = static_cast<unsigned int>(
+          mWidgets.size()); i < sz; ++i)
+    {
+        if (mWidgets[i] == widget)
+        {
+            toBeFocusedIndex = i;
+            break;
+        }
+    }
+
+    if (toBeFocusedIndex < 0)
+        return;
+
+    Widget *const oldFocused = mFocusedWidget;
+
+    if (oldFocused != widget)
+    {
+        mFocusedWidget = mWidgets.at(toBeFocusedIndex);
+
+        if (oldFocused)
+        {
+            Event focusEvent(oldFocused);
+            distributeFocusLostEvent(focusEvent);
+        }
+
+        Event focusEvent(mWidgets.at(toBeFocusedIndex));
+        distributeFocusGainedEvent(focusEvent);
+    }
+}
+
+void FocusHandler::requestModalMouseInputFocus(Widget* widget)
+{
+    if (mModalMouseInputFocusedWidget
+        && mModalMouseInputFocusedWidget != widget)
+    {
+        return;
+    }
+
+    mModalMouseInputFocusedWidget = widget;
+}
+
+void FocusHandler::releaseModalMouseInputFocus(Widget* widget)
+{
+    if (mModalMouseInputFocusedWidget == widget)
+        mModalMouseInputFocusedWidget = nullptr;
+}
+
+Widget* FocusHandler::getFocused() const
+{
+    return mFocusedWidget;
+}
+
+Widget* FocusHandler::getModalFocused() const
+{
+    return mModalFocusedWidget;
+}
+
+Widget* FocusHandler::getModalMouseInputFocused() const
+{
+    return mModalMouseInputFocusedWidget;
+}
+
+void FocusHandler::focusNext()
+{
+    int i;
+    int focusedWidget = -1;
+    const int sz = static_cast<int>(mWidgets.size());
+    for (i = 0; i < sz; ++i)
+    {
+        if (mWidgets[i] == mFocusedWidget)
+            focusedWidget = i;
+    }
+    const int focused = focusedWidget;
+
+    // i is a counter that ensures that the following loop
+    // won't get stuck in an infinite loop
+    i = sz;
+    do
+    {
+        ++ focusedWidget;
+
+        if (i == 0)
+        {
+            focusedWidget = -1;
+            break;
+        }
+
+        -- i;
+
+        if (focusedWidget >= sz)
+            focusedWidget = 0;
+
+        if (focusedWidget == focused)
+            return;
+    }
+    while (!mWidgets.at(focusedWidget)->isFocusable());
+
+    if (focusedWidget >= 0)
+    {
+        mFocusedWidget = mWidgets.at(focusedWidget);
+
+        Event focusEvent(mFocusedWidget);
+        distributeFocusGainedEvent(focusEvent);
+    }
+
+    if (focused >= 0)
+    {
+        Event focusEvent(mWidgets.at(focused));
+        distributeFocusLostEvent(focusEvent);
+    }
+}
+
+void FocusHandler::focusPrevious()
+{
+    if (mWidgets.empty())
+    {
+        mFocusedWidget = nullptr;
+        return;
+    }
+
+    int i;
+    int focusedWidget = -1;
+    const int sz = static_cast<int>(mWidgets.size());
+    for (i = 0; i < sz; ++ i)
+    {
+        if (mWidgets[i] == mFocusedWidget)
+            focusedWidget = i;
+    }
+    const int focused = focusedWidget;
+
+    // i is a counter that ensures that the following loop
+    // won't get stuck in an infinite loop
+    i = sz;
+    do
+    {
+        -- focusedWidget;
+
+        if (i == 0)
+        {
+            focusedWidget = -1;
+            break;
+        }
+
+        -- i;
+
+        if (focusedWidget <= 0)
+            focusedWidget = sz - 1;
+
+        if (focusedWidget == focused)
+            return;
+    }
+    while (!mWidgets.at(focusedWidget)->isFocusable());
+
+    if (focusedWidget >= 0)
+    {
+        mFocusedWidget = mWidgets.at(focusedWidget);
+        Event focusEvent(mFocusedWidget);
+        distributeFocusGainedEvent(focusEvent);
+    }
+
+    if (focused >= 0)
+    {
+        Event focusEvent(mWidgets.at(focused));
+        distributeFocusLostEvent(focusEvent);
+    }
+}
+
+bool FocusHandler::isFocused(const Widget* widget) const
+{
+    return mFocusedWidget == widget;
+}
+
+void FocusHandler::add(Widget* widget)
+{
+    mWidgets.push_back(widget);
+}
+
+void FocusHandler::focusNone()
+{
+    if (mFocusedWidget)
+    {
+        Widget *const focused = mFocusedWidget;
+        mFocusedWidget = nullptr;
+
+        Event focusEvent(focused);
+        distributeFocusLostEvent(focusEvent);
+    }
+}
+
+void FocusHandler::distributeFocusLostEvent(const Event& focusEvent)
+{
+    Widget *const sourceWidget = focusEvent.getSource();
+
+    std::list<FocusListener*> focusListeners
+        = sourceWidget->_getFocusListeners();
+
+    // Send the event to all focus listeners of the widget.
+    for (std::list<FocusListener*>::const_iterator
+          it = focusListeners.begin();
+          it != focusListeners.end();
+          ++ it)
+    {
+        (*it)->focusLost(focusEvent);
+    }
+}
+
+Widget* FocusHandler::getDraggedWidget()
+{
+    return mDraggedWidget;
+}
+
+void FocusHandler::setDraggedWidget(Widget* draggedWidget)
+{
+    mDraggedWidget = draggedWidget;
+}
+
+Widget* FocusHandler::getLastWidgetWithMouse()
+{
+    return mLastWidgetWithMouse;
+}
+
+void FocusHandler::setLastWidgetWithMouse(Widget* lastWidgetWithMouse)
+{
+    mLastWidgetWithMouse = lastWidgetWithMouse;
+}
+
+Widget* FocusHandler::getLastWidgetWithModalFocus()
+{
+    return mLastWidgetWithModalFocus;
+}
+
+void FocusHandler::setLastWidgetWithModalFocus(Widget* widget)
+{
+    mLastWidgetWithModalFocus = widget;
+}
+
+Widget* FocusHandler::getLastWidgetWithModalMouseInputFocus()
+{
+    return mLastWidgetWithModalMouseInputFocus;
+}
+
+void FocusHandler::setLastWidgetWithModalMouseInputFocus(Widget* widget)
+{
+    mLastWidgetWithModalMouseInputFocus = widget;
+}
+
+Widget* FocusHandler::getLastWidgetPressed()
+{
+    return mLastWidgetPressed;
+}
+
+void FocusHandler::setLastWidgetPressed(Widget* lastWidgetPressed)
+{
+    mLastWidgetPressed = lastWidgetPressed;
 }
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index e32b9afa1..f12819e75 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -20,59 +20,307 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef GUI_FOCUSHANDLER_H
 #define GUI_FOCUSHANDLER_H
 
-#include <guichan/focushandler.hpp>
+#include "gui/focushandler.h"
 
 #include <list>
+#include <vector>
 
 #include "localconsts.h"
 
+class Event;
+class Widget;
+
 /**
  * The focus handler. This focus handler does exactly the same as the Guichan
  * focus handler, but keeps a stack of modal widgets to be able to handle
  * multiple modal focus requests.
  */
-class FocusHandler final : public gcn::FocusHandler
+class FocusHandler final
 {
     public:
-        FocusHandler() :
-            mModalStack()
-        { }
+        FocusHandler();
 
         A_DELETE_COPY(FocusHandler)
 
         /**
-         * Sets modal focus to a widget. When there is already a modal widget
-         * then that widget loses modal focus and will regain it after this
-         * widget releases his modal focus.
-         */
-        void requestModalFocus(gcn::Widget *widget) override final;
+          * Requests focus for a widget. Focus will only be granted to a widget
+          * if it's focusable and if no other widget has modal focus.
+          * If a widget receives focus a focus event will be sent to the
+          * focus listeners of the widget.
+          *
+          * @param widget The widget to request focus for.
+          * @see isFocused, Widget::requestFocus
+          */
+        void requestFocus(Widget* widget);
 
         /**
-         * Releases modal focus of a widget. When this widget had modal focus
-         * and there are other widgets that had also requested modal focus,
-         * then modal focus will be transfered to the last of those.
-         */
-        void releaseModalFocus(gcn::Widget *widget) override final;
+          * Requests modal focus for a widget. Focus will only be granted
+          * to a widget if it's focusable and if no other widget has modal
+          * focus.
+          *
+          * @param widget The widget to request modal focus for.
+          * @throws Exception when another widget already has modal focus.
+          * @see releaseModalFocus, Widget::requestModalFocus
+          */
+        void requestModalFocus(Widget* widget);
 
         /**
-         * Removes a widget from the focus handler. Also makes sure no dangling
-         * pointers remain in modal focus stack.
-         */
-        void remove(gcn::Widget *widget) override final;
+          * Requests modal mouse input focus for a widget. Focus will only
+          * be granted to a widget if it's focusable and if no other widget
+          * has modal mouse input focus.
+          *
+          * Modal mouse input focus means no other widget then the widget with
+          * modal mouse input focus will receive mouse input. The widget with
+          * modal mouse input focus will also receive mouse input no matter what
+          * the mouse input is or where the mouse input occurs.
+          *
+          * @param widget The widget to focus for modal mouse input focus.
+          * @throws Exception when another widget already has modal mouse input
+          *         focus.
+          * @see releaseModalMouseInputFocus, Widget::requestModalMouseInputFocus
+          */
+        void requestModalMouseInputFocus(Widget* widget);
 
         /**
-         * Overloaded to allow windows to move to the top when one of their
-         * widgets is tabbed to when tabbing through focusable elements.
-         */
-        void tabNext() override final;
+          * Releases modal focus if the widget has modal focus.
+          * If the widget doesn't have modal focus no relase will occur.
+          *
+          * @param widget The widget to release modal focus for.
+          * @see reuqestModalFocus, Widget::releaseModalFocus
+          */
+        void releaseModalFocus(Widget* widget);
+
+        /**
+          * Releases modal mouse input focus if the widget has modal mouse input
+          * focus. If the widget doesn't have modal mouse input focus no relase
+          * will occur.
+          *
+          * @param widget the widget to release modal mouse input focus for.
+          * @see requestModalMouseInputFocus, Widget::releaseModalMouseInputFocus
+          */
+        void releaseModalMouseInputFocus(Widget* widget);
+
+        /**
+          * Checks if a widget is focused.
+          *
+          * @param widget The widget to check.
+          * @return True if the widget is focused, false otherwise.
+          * @see Widget::isFocused
+          */
+        bool isFocused(const Widget* widget) const;
+
+        /**
+          * Gets the widget with focus.
+          *
+          * @return The widget with focus. NULL if no widget has focus.
+          */
+        Widget* getFocused() const A_WARN_UNUSED;
+
+        /**
+          * Gets the widget with modal focus.
+          *
+          * @return The widget with modal focus. NULL if no widget has
+          *         modal focus.
+          */
+        Widget* getModalFocused() const A_WARN_UNUSED;
+
+        /**
+          * Gets the widget with modal mouse input focus.
+          *
+          * @return The widget with modal mouse input focus. NULL if
+          *         no widget has modal mouse input focus.
+          */
+        Widget* getModalMouseInputFocused() const A_WARN_UNUSED;
+
+        /**
+          * Focuses the next widget added to a conainer.
+          * If no widget has focus the first widget gets focus. The order
+          * in which the widgets are focused is determined by the order
+          * they were added to a container.
+          *
+          * @see focusPrevious
+          */
+        void focusNext();
+
+        /**
+          * Focuses the previous widget added to a contaienr.
+          * If no widget has focus the first widget gets focus. The order
+          * in which the widgets are focused is determined by the order
+          * they were added to a container.
+          *
+          * @see focusNext
+          */
+        void focusPrevious();
+
+        /**
+          * Adds a widget to by handles by the focus handler.
+          *
+          * @param widget The widget to add.
+          * @see remove
+          */
+        void add(Widget* widget);
+
+        /**
+          * Removes a widget from the focus handler.
+          *
+          * @param widget The widget to remove.
+          * @see add
+          */
+        void remove(Widget* widget);
+
+        /**
+          * Focuses nothing. A focus event will also be sent to the
+          * focused widget's focus listeners if a widget has focus.
+          */
+        void focusNone();
+
+        /**
+          * Focuses the next widget which allows tabbing in unless
+          * the current focused Widget disallows tabbing out.
+          *
+          * @see tabPrevious
+          */
+        void tabNext();
+
+        /**
+          * Focuses the previous widget which allows tabbing in unless
+          * current focused widget disallows tabbing out.
+          *
+          * @see tabNext
+          */
+        void tabPrevious();
+
+        /**
+          * Gets the widget being dragged. Used by the Gui class to
+          * keep track of the dragged widget.
+          *
+          * @return the widget being dragged.
+          * @see setDraggedWidget
+          */
+        Widget* getDraggedWidget() A_WARN_UNUSED;
+
+        /**
+          * Sets the widget being dragged. Used by the Gui class to
+          * keep track of the dragged widget.
+          *
+          * @param draggedWidget The widget being dragged.
+          * @see getDraggedWidget
+          */
+        void setDraggedWidget(Widget* draggedWidget);
+
+        /**
+          * Gets the last widget with the mouse. Used by the Gui class
+          * to keep track the last widget with the mouse.
+          *
+          * @return The last widget with the mouse.
+          * @see setLastWidgetWithMouse
+          */
+        Widget* getLastWidgetWithMouse() A_WARN_UNUSED;
+
+        /**
+          * Sets the last widget with the mouse. Used by the Gui class
+          * to keep track the last widget with the mouse.
+          *
+          * @param lastWidgetWithMouse The last widget with the mouse.
+          * @see getLastWidgetWithMouse
+          */
+        void setLastWidgetWithMouse(Widget* lastWidgetWithMouse);
+
+        /**
+          * Gets the last widget with modal focus.
+          *
+          * @return The last widget with modal focus.
+          * @see setLastWidgetWithModalFocus
+          */
+        Widget* getLastWidgetWithModalFocus() A_WARN_UNUSED;
 
-        void tabPrevious() override final;
+        /**
+          * Sets the last widget with modal focus.
+          *
+          * @param widget The last widget with modal focus.
+          * @see getLastWidgetWithModalFocus
+          */
+        void setLastWidgetWithModalFocus(Widget* widget);
+
+        /**
+          * Gets the last widget with modal mouse input focus.
+          *
+          * @return The last widget with modal mouse input focus.
+          * @see setLastWidgetWithModalMouseInputFocus
+          */
+        Widget* getLastWidgetWithModalMouseInputFocus() A_WARN_UNUSED;
+
+        /**
+          * Sets the last widget with modal mouse input focus.
+          *
+          * @param widget The last widget with modal mouse input focus.
+          * @see getLastWidgetWithModalMouseInputFocus
+          */
+        void setLastWidgetWithModalMouseInputFocus(Widget* widget);
+
+        /**
+          * Gets the last widget pressed. Used by the Gui class to keep track
+          * of pressed widgets.
+          *
+          * @return The last widget pressed.
+          * @see setLastWidgetPressed
+          */
+        Widget* getLastWidgetPressed() A_WARN_UNUSED;
 
-        void distributeFocusGainedEvent(const gcn::Event &focusEvent)
-                                        override final;
+        /**
+          * Sets the last widget pressed. Used by the Gui class to keep track
+          * of pressed widgets.
+          *
+          * @param lastWidgetPressed The last widget pressed.
+          * @see getLastWidgetPressed
+          */
+        void setLastWidgetPressed(Widget* lastWidgetPressed);
 
     private:
         /**
@@ -82,9 +330,84 @@ class FocusHandler final : public gcn::FocusHandler
         void checkForWindow() const;
 
         /**
+         * Distributes a focus lost event.
+         *
+         * @param focusEvent the event to distribute.
+         * @since 0.7.0
+         */
+        static void distributeFocusLostEvent(const Event& focusEvent);
+
+        /**
+         * Distributes a focus gained event.
+         *
+         * @param focusEvent the event to distribute.
+         * @since 0.7.0
+         */
+        static void distributeFocusGainedEvent(const Event& focusEvent);
+
+        /**
+         * Typedef.
+         */
+        typedef std::vector<Widget*> WidgetVector;
+
+        /**
+         * Typedef.
+         */
+        typedef WidgetVector::iterator WidgetIterator;
+
+        /**
+         * Holds the widgets currently being handled by the
+         * focus handler.
+         */
+        WidgetVector mWidgets;
+
+        /**
+         * Holds the focused widget. NULL if no widget has focus.
+         */
+        Widget* mFocusedWidget;
+
+        /**
+         * Holds the modal focused widget. NULL if no widget has
+         * modal focused.
+         */
+        Widget* mModalFocusedWidget;
+
+        /**
+         * Holds the modal mouse input focused widget. NULL if no widget
+         * is being dragged.
+         */
+        Widget* mModalMouseInputFocusedWidget;
+
+        /**
+         * Holds the dragged widget. NULL if no widget is
+         * being dragged.
+         */
+        Widget* mDraggedWidget;
+
+        /**
+         * Holds the last widget with the mouse.
+         */
+        Widget* mLastWidgetWithMouse;
+
+        /**
+         * Holds the last widget with modal focus.
+         */
+        Widget* mLastWidgetWithModalFocus;
+
+        /**
+         * Holds the last widget with modal mouse input focus.
+         */
+        Widget* mLastWidgetWithModalMouseInputFocus;
+
+        /**
+         * Holds the last widget pressed.
+         */
+        Widget* mLastWidgetPressed;
+
+        /**
          * Stack of widgets that have requested modal forcus.
          */
-        std::list<gcn::Widget*> mModalStack;
+        std::list<Widget*> mModalStack;
 };
 
 #endif  // GUI_FOCUSHANDLER_H
diff --git a/src/gui/sdlfont.cpp b/src/gui/font.cpp
index f97970a26..8c022f99d 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/font.cpp
@@ -21,7 +21,50 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/sdlfont.h"
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gui/font.h"
 
 #include "logger.h"
 #include "main.h"
@@ -34,13 +77,10 @@
 #include "resources/surfaceimagehelper.h"
 
 #include "utils/paths.h"
-#include "utils/physfsrwops.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
 
-#include <guichan/exception.hpp>
-
 #include "debug.h"
 
 const unsigned int CACHE_SIZE = 256;
@@ -50,7 +90,7 @@ const unsigned int CACHE_SIZE_SMALL3 = 170;
 const unsigned int CLEAN_TIME = 7;
 const int OUTLINE_SIZE = 1;
 
-bool SDLFont::mSoftMode(false);
+bool Font::mSoftMode(false);
 
 char *strBuf = nullptr;
 
@@ -59,8 +99,8 @@ int sdlTextChunkCnt = 0;
 #endif
 
 SDLTextChunkSmall::SDLTextChunkSmall(const std::string &text0,
-                                     const gcn::Color &color0,
-                                     const gcn::Color &color1) :
+                                     const Color &color0,
+                                     const Color &color1) :
     text(text0),
     color(color0),
     color2(color1)
@@ -85,7 +125,7 @@ bool SDLTextChunkSmall::operator<(const SDLTextChunkSmall &chunk) const
     if (chunk.text != text)
         return chunk.text > text;
 
-    const gcn::Color &c = chunk.color;
+    const Color &c = chunk.color;
     if (c.r != color.r)
         return c.r > color.r;
     if (c.g != color.g)
@@ -93,7 +133,7 @@ bool SDLTextChunkSmall::operator<(const SDLTextChunkSmall &chunk) const
     if (c.b != color.b)
         return c.b > color.b;
 
-    const gcn::Color &c2 = chunk.color2;
+    const Color &c2 = chunk.color2;
     if (c2.r != color2.r)
         return c2.r > color2.r;
     if (c2.g != color2.g)
@@ -101,14 +141,14 @@ bool SDLTextChunkSmall::operator<(const SDLTextChunkSmall &chunk) const
     if (c2.b != color2.b)
         return c2.b > color2.b;
 
-    if (c.a != color.a && SDLFont::mSoftMode)
+    if (c.a != color.a && Font::mSoftMode)
         return c.a > color.a;
 
     return false;
 }
 
-SDLTextChunk::SDLTextChunk(const std::string &text0, const gcn::Color &color0,
-                           const gcn::Color &color1) :
+SDLTextChunk::SDLTextChunk(const std::string &text0, const Color &color0,
+                           const Color &color1) :
     img(nullptr),
     text(text0),
     color(color0),
@@ -337,9 +377,9 @@ void TextChunkList::clear()
 
 static int fontCounter;
 
-SDLFont::SDLFont(std::string filename,
-                 const int size,
-                 const int style) :
+Font::Font(std::string filename,
+           const int size,
+           const int style) :
     mFont(nullptr),
     mCreateCounter(0),
     mDeleteCounter(0),
@@ -350,7 +390,7 @@ SDLFont::SDLFont(std::string filename,
         mSoftMode = imageHelper->useOpenGL() == RENDER_SOFTWARE;
         if (TTF_Init() == -1)
         {
-            throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " +
+            logger->error("Unable to initialize SDL_ttf: " +
                 std::string(TTF_GetError()));
         }
     }
@@ -373,15 +413,15 @@ SDLFont::SDLFont(std::string filename,
         mFont = openFont(fixDirSeparators(backFile).c_str(), size);
         if (!mFont)
         {
-            throw GCN_EXCEPTION("SDLSDLFont::SDLSDLFont: " +
-                                std::string(TTF_GetError()));
+            logger->error("Font::Font: " +
+                          std::string(TTF_GetError()));
         }
     }
 
     TTF_SetFontStyle(mFont, style);
 }
 
-SDLFont::~SDLFont()
+Font::~Font()
 {
     TTF_CloseFont(mFont);
     mFont = nullptr;
@@ -395,7 +435,7 @@ SDLFont::~SDLFont()
     }
 }
 
-TTF_Font *SDLFont::openFont(const char *const name, const int size)
+TTF_Font *Font::openFont(const char *const name, const int size)
 {
 // disabled for now because some systems like gentoo cant use it
 // #ifdef USE_SDL2
@@ -409,9 +449,9 @@ TTF_Font *SDLFont::openFont(const char *const name, const int size)
 // #endif
 }
 
-void SDLFont::loadFont(std::string filename,
-                       const int size,
-                       const int style)
+void Font::loadFont(std::string filename,
+                    const int size,
+                    const int style)
 {
     if (fontCounter == 0 && TTF_Init() == -1)
     {
@@ -425,7 +465,7 @@ void SDLFont::loadFont(std::string filename,
 
     if (!font)
     {
-        logger->log("SDLSDLFont::SDLSDLFont: " +
+        logger->log("Font::Font: " +
                     std::string(TTF_GetError()));
         return;
     }
@@ -438,20 +478,20 @@ void SDLFont::loadFont(std::string filename,
     clear();
 }
 
-void SDLFont::clear()
+void Font::clear()
 {
     for (size_t f = 0; f < CACHES_NUMBER; f ++)
         mCache[f].clear();
 }
 
-void SDLFont::drawString(gcn::Graphics *const graphics,
-                         const std::string &text,
-                         const int x, const int y)
+void Font::drawString(Graphics *const graphics,
+                      const std::string &text,
+                      const int x, const int y)
 {
-    BLOCK_START("SDLFont::drawString")
+    BLOCK_START("Font::drawString")
     if (text.empty())
     {
-        BLOCK_END("SDLFont::drawString")
+        BLOCK_END("Font::drawString")
         return;
     }
 
@@ -459,8 +499,8 @@ void SDLFont::drawString(gcn::Graphics *const graphics,
     if (!g)
         return;
 
-    gcn::Color col = g->getColor();
-    const gcn::Color &col2 = g->getColor2();
+    Color col = g->getColor();
+    const Color &col2 = g->getColor2();
     const float alpha = static_cast<float>(col.a) / 255.0F;
 
     /* The alpha value is ignored at string generation so avoid caching the
@@ -482,7 +522,7 @@ void SDLFont::drawString(gcn::Graphics *const graphics,
         if (image)
         {
             image->setAlpha(alpha);
-            g->drawImage2(image, x, y);
+            g->drawImage(image, x, y);
         }
     }
     else
@@ -504,14 +544,14 @@ void SDLFont::drawString(gcn::Graphics *const graphics,
 
         const Image *const image = chunk2->img;
         if (image)
-            g->drawImage2(image, x, y);
+            g->drawImage(image, x, y);
     }
-    BLOCK_END("SDLFont::drawString")
+    BLOCK_END("Font::drawString")
 }
 
-void SDLFont::slowLogic(const int rnd)
+void Font::slowLogic(const int rnd)
 {
-    BLOCK_START("SDLFont::slowLogic")
+    BLOCK_START("Font::slowLogic")
     if (!mCleanTime)
     {
         mCleanTime = cur_time + CLEAN_TIME + rnd;
@@ -521,10 +561,10 @@ void SDLFont::slowLogic(const int rnd)
         doClean();
         mCleanTime = cur_time + CLEAN_TIME + rnd;
     }
-    BLOCK_END("SDLFont::slowLogic")
+    BLOCK_END("Font::slowLogic")
 }
 
-int SDLFont::getWidth(const std::string &text) const
+int Font::getWidth(const std::string &text) const
 {
     if (text.empty())
         return 0;
@@ -552,12 +592,12 @@ int SDLFont::getWidth(const std::string &text) const
     return w;
 }
 
-int SDLFont::getHeight() const
+int Font::getHeight() const
 {
     return TTF_FontHeight(mFont);
 }
 
-void SDLFont::doClean()
+void Font::doClean()
 {
     for (unsigned int f = 0; f < CACHES_NUMBER; f ++)
     {
@@ -599,7 +639,19 @@ void SDLFont::doClean()
     }
 }
 
-const TextChunkList *SDLFont::getCache() const
+int Font::getStringIndexAt(const std::string& text, const int x) const
+{
+    const size_t sz = text.size();
+    for (size_t i = 0; i < sz; ++i)
+    {
+        if (getWidth(text.substr(0, i)) > x)
+            return i;
+    }
+
+    return static_cast<int>(sz);
+}
+
+const TextChunkList *Font::getCache() const
 {
     return mCache;
 }
diff --git a/src/gui/sdlfont.h b/src/gui/font.h
index b2638f835..12ba473d8 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/font.h
@@ -21,11 +21,53 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SDLFONT_H
-#define GUI_SDLFONT_H
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
-#include <guichan/color.hpp>
-#include <guichan/font.hpp>
+#ifndef GUI_FONT_H
+#define GUI_FONT_H
+
+#include "gui/color.h"
 
 #include <SDL_ttf.h>
 
@@ -34,6 +76,8 @@
 
 #include "localconsts.h"
 
+class Color;
+class Graphics;
 class Image;
 
 const unsigned int CACHES_NUMBER = 256;
@@ -41,8 +85,8 @@ const unsigned int CACHES_NUMBER = 256;
 class SDLTextChunkSmall
 {
     public:
-        SDLTextChunkSmall(const std::string &text0, const gcn::Color &color0,
-                          const gcn::Color &color1);
+        SDLTextChunkSmall(const std::string &text0, const Color &color0,
+                          const Color &color1);
 
         SDLTextChunkSmall(const SDLTextChunkSmall &old);
 
@@ -50,15 +94,15 @@ class SDLTextChunkSmall
         bool operator<(const SDLTextChunkSmall &chunk) const;
 
         std::string text;
-        gcn::Color color;
-        gcn::Color color2;
+        Color color;
+        Color color2;
 };
 
 class SDLTextChunk final
 {
     public:
-        SDLTextChunk(const std::string &text0, const gcn::Color &color0,
-                     const gcn::Color &color1);
+        SDLTextChunk(const std::string &text0, const Color &color0,
+                     const Color &color1);
 
         A_DELETE_COPY(SDLTextChunk)
 
@@ -70,8 +114,8 @@ class SDLTextChunk final
 
         Image *img;
         std::string text;
-        gcn::Color color;
-        gcn::Color color2;
+        Color color;
+        Color color2;
         SDLTextChunk *prev;
         SDLTextChunk *next;
 };
@@ -106,34 +150,33 @@ class TextChunkList final
  *
  * <b>NOTE:</b> This class initializes SDL_ttf as necessary.
  */
-class SDLFont final : public gcn::Font
+class Font final
 {
     public:
-        SDLFont(std::string filename,
-                const int size,
-                const int style = 0);
+        Font(std::string filename,
+             const int size,
+             const int style = 0);
 
-        A_DELETE_COPY(SDLFont)
+        A_DELETE_COPY(Font)
 
-        ~SDLFont();
+        ~Font();
 
         void loadFont(std::string filename,
                       const int size,
                       const int style = 0);
 
-        int getWidth(const std::string &text) const override
-                     final A_WARN_UNUSED;
+        int getWidth(const std::string &text) const A_WARN_UNUSED;
 
-        int getHeight() const override final A_WARN_UNUSED;
+        int getHeight() const A_WARN_UNUSED;
 
         const TextChunkList *getCache() const A_WARN_UNUSED;
 
         /**
          * @see Font::drawString
          */
-        void drawString(gcn::Graphics *const graphics,
+        void drawString(Graphics *const graphics,
                         const std::string &text,
-                        const int x, const int y) override final;
+                        const int x, const int y);
 
         void clear();
 
@@ -147,6 +190,9 @@ class SDLFont final : public gcn::Font
         int getDeleteCounter() const A_WARN_UNUSED
         { return mDeleteCounter; }
 
+        int getStringIndexAt(const std::string& text,
+                             const int x) const A_WARN_UNUSED;
+
         static bool mSoftMode;
 
     private:
@@ -165,4 +211,4 @@ class SDLFont final : public gcn::Font
 extern int sdlTextChunkCnt;
 #endif
 
-#endif  // GUI_SDLFONT_H
+#endif  // GUI_FONT_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 126fc9a3b..5914e43d9 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -20,18 +20,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mouseinput.h"
-
 #include "gui/gui.h"
 
 #include "gui/focushandler.h"
+#include "gui/font.h"
 #include "gui/palette.h"
-#include "gui/sdlfont.h"
 #include "gui/sdlinput.h"
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/mouseevent.h"
+#include "events/mouseevent.h"
+
 #include "gui/widgets/window.h"
 
 #include "client.h"
@@ -39,9 +38,13 @@
 #include "dragdrop.h"
 #include "touchmanager.h"
 
+#include "events/keyevent.h"
+
+#include "listeners/focuslistener.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 #include "input/keyinput.h"
+#include "input/mouseinput.h"
 
 #include "resources/cursor.h"
 #include "resources/image.h"
@@ -51,8 +54,6 @@
 #include "utils/langs.h"
 #include "utils/timer.h"
 
-#include <guichan/exception.hpp>
-
 #include "debug.h"
 
 // Guichan stuff
@@ -60,7 +61,7 @@ Gui *gui = nullptr;
 SDLInput *guiInput = nullptr;
 
 // Bolded font
-SDLFont *boldFont = nullptr;
+Font *boldFont = nullptr;
 
 class GuiConfigListener final : public ConfigListener
 {
@@ -160,16 +161,7 @@ void Gui::postInit(Graphics *const graphics)
     if (fontFile.empty())
         fontFile = branding.getStringValue("font");
 
-    try
-    {
-        mGuiFont = new SDLFont(fontFile, fontSize);
-    }
-    catch (const gcn::Exception &e)
-    {
-        logger->error(std::string("Unable to load '").append(fontFile)
-                      .append("': ").append(e.getMessage()));
-    }
-
+    mGuiFont = new Font(fontFile, fontSize);
 
     // Set particle font
     fontFile = config.getValue("particleFont", "");
@@ -188,65 +180,28 @@ void Gui::postInit(Graphics *const graphics)
     if (fontFile.empty())
         fontFile = branding.getStringValue("particleFont");
 
-    try
-    {
-        mInfoParticleFont = new SDLFont(
-            fontFile, fontSize, TTF_STYLE_BOLD);
-    }
-    catch (const gcn::Exception &e)
-    {
-        logger->error(std::string("Unable to load '").append(fontFile)
-                      .append("': ").append(e.getMessage()));
-    }
-
+    mInfoParticleFont = new Font(fontFile, fontSize, TTF_STYLE_BOLD);
 
     // Set bold font
     fontFile = config.getValue("boldFont", "");
     if (fontFile.empty())
         fontFile = branding.getStringValue("boldFont");
 
-    try
-    {
-        boldFont = new SDLFont(fontFile, fontSize);
-    }
-    catch (const gcn::Exception &e)
-    {
-        logger->error(std::string("Unable to load '").append(fontFile)
-                      .append("': ").append(e.getMessage()));
-    }
-
+    boldFont = new Font(fontFile, fontSize);
 
     // Set help font
     fontFile = config.getValue("helpFont", "");
     if (fontFile.empty())
         fontFile = branding.getStringValue("helpFont");
 
-    try
-    {
-        mHelpFont = new SDLFont(fontFile, fontSize);
-    }
-    catch (const gcn::Exception &e)
-    {
-        logger->error(std::string("Unable to load '").append(fontFile)
-                      .append("': ").append(e.getMessage()));
-    }
-
+    mHelpFont = new Font(fontFile, fontSize);
 
     // Set secure font
     fontFile = config.getValue("secureFont", "");
     if (fontFile.empty())
         fontFile = branding.getStringValue("secureFont");
 
-    try
-    {
-        mSecureFont = new SDLFont(fontFile, fontSize);
-    }
-    catch (const gcn::Exception &e)
-    {
-        logger->error(std::string("Unable to load '").append(fontFile)
-                      .append("': ").append(e.getMessage()));
-    }
-
+    mSecureFont = new Font(fontFile, fontSize);
 
     // Set npc font
     const int npcFontSize = config.getIntValue("npcfontSize");
@@ -266,17 +221,9 @@ void Gui::postInit(Graphics *const graphics)
     if (fontFile.empty())
         fontFile = branding.getStringValue("npcFont");
 
-    try
-    {
-        mNpcFont = new SDLFont(fontFile, npcFontSize);
-    }
-    catch (const gcn::Exception &e)
-    {
-        logger->error(std::string("Unable to load '").append(fontFile)
-                      .append("': ").append(e.getMessage()));
-    }
+    mNpcFont = new Font(fontFile, npcFontSize);
 
-    gcn::Widget::setGlobalFont(mGuiFont);
+    Widget::setGlobalFont(mGuiFont);
 
     // Initialize mouse cursor and listen for changes to the option
     setUseCustomCursor(config.getBoolValue("customcursor"));
@@ -473,7 +420,7 @@ bool Gui::handleKeyInput2()
             // change focus.
             if (!keyEventConsumed && mTabbing && keyInput.getActionId()
                 == static_cast<int>(Input::KEY_GUI_TAB)
-                && keyInput.getType() == gcn::KeyInput::PRESSED)
+                && keyInput.getType() == KeyInput::PRESSED)
             {
                 if (keyInput.isShiftPressed())
                     mFocusHandler->tabPrevious();
@@ -499,13 +446,12 @@ void Gui::draw()
     if ((client->getMouseFocused() || button & SDL_BUTTON(1))
         && mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0F)
     {
-        Graphics *g2 = static_cast<Graphics*>(mGraphics);
         const Image *const image = dragDrop.getItemImage();
         if (image)
         {
             const int posX = mouseX - (image->mBounds.w / 2);
             const int posY = mouseY - (image->mBounds.h / 2);
-            g2->drawImage2(image, posX, posY);
+            mGraphics->drawImage(image, posX, posY);
         }
         if (mGuiFont)
         {
@@ -514,8 +460,8 @@ void Gui::draw()
             {
                 const int posX = mouseX - mGuiFont->getWidth(str) / 2;
                 const int posY = mouseY + (image ? image->mBounds.h / 2 : 0);
-                g2->setColorAll(mForegroundColor, mForegroundColor2);
-                mGuiFont->drawString(g2, str, posX, posY);
+                mGraphics->setColorAll(mForegroundColor, mForegroundColor2);
+                mGuiFont->drawString(mGraphics, str, posX, posY);
             }
         }
 
@@ -523,7 +469,7 @@ void Gui::draw()
         if (mouseCursor)
         {
             mouseCursor->setAlpha(mMouseCursorAlpha);
-            g2->drawImage2(mouseCursor, mouseX - 15, mouseY - 17);
+            mGraphics->drawImage(mouseCursor, mouseX - 15, mouseY - 17);
         }
     }
 
@@ -579,20 +525,20 @@ void Gui::setUseCustomCursor(const bool customCursor)
     }
 }
 
-void Gui::handleMouseMoved(const gcn::MouseInput &mouseInput)
+void Gui::handleMouseMoved(const MouseInput &mouseInput)
 {
     gcn::Gui::handleMouseMoved(mouseInput);
     mMouseInactivityTimer = 0;
 }
 
-void Gui::handleMousePressed(const gcn::MouseInput &mouseInput)
+void Gui::handleMousePressed(const MouseInput &mouseInput)
 {
     const int x = mouseInput.getX();
     const int y = mouseInput.getY();
     const unsigned int button = mouseInput.getButton();
     const int timeStamp = mouseInput.getTimeStamp();
 
-    gcn::Widget *sourceWidget = getMouseEventSource(x, y);
+    Widget *sourceWidget = getMouseEventSource(x, y);
 
     if (mFocusHandler->getDraggedWidget())
         sourceWidget = mFocusHandler->getDraggedWidget();
@@ -655,14 +601,14 @@ void Gui::updateFonts()
     mNpcFont->loadFont(fontFile, npcFontSize);
 }
 
-void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
+void Gui::distributeMouseEvent(Widget* source, int type, int button,
                                int x, int y, bool force,
                                bool toSourceOnly)
 {
     if (!source || !mFocusHandler)
         return;
 
-    gcn::Widget* widget = source;
+    Widget* widget = source;
 
     if (!force && mFocusHandler->getModalFocused() != nullptr
         && !widget->isModalFocused())
@@ -680,12 +626,12 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
         mAltPressed, mMetaPressed, type, button,
         x, y, mClickCount);
 
-    gcn::Widget* parent = source;
+    Widget* parent = source;
     while (parent)
     {
         // If the widget has been removed due to input
         // cancel the distribution.
-        if (!gcn::Widget::widgetExists(widget))
+        if (!Widget::widgetExists(widget))
             break;
 
         parent = widget->getParent();
@@ -698,42 +644,42 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
             mouseEvent.setX(x - widgetX);
             mouseEvent.setY(y - widgetY);
 
-            std::list<gcn::MouseListener*> mouseListeners
+            std::list<MouseListener*> mouseListeners
                 = widget->_getMouseListeners();
 
             // Send the event to all mouse listeners of the widget.
-            for (std::list<gcn::MouseListener*>::const_iterator
+            for (std::list<MouseListener*>::const_iterator
                  it = mouseListeners.begin();
                  it != mouseListeners.end(); ++ it)
             {
                 switch (mouseEvent.getType())
                 {
-                    case gcn::MouseEvent::ENTERED:
+                    case MouseEvent::ENTERED:
                         (*it)->mouseEntered(mouseEvent);
                         break;
-                    case gcn::MouseEvent::EXITED:
+                    case MouseEvent::EXITED:
                         (*it)->mouseExited(mouseEvent);
                         break;
-                    case gcn::MouseEvent::MOVED:
+                    case MouseEvent::MOVED:
                         (*it)->mouseMoved(mouseEvent);
                         break;
-                    case gcn::MouseEvent::PRESSED:
+                    case MouseEvent::PRESSED:
                         (*it)->mousePressed(mouseEvent);
                         break;
-                    case gcn::MouseEvent::RELEASED:
+                    case MouseEvent::RELEASED:
                     case 100:  // manual hack for release on target after drag
                         (*it)->mouseReleased(mouseEvent);
                         break;
-                    case gcn::MouseEvent::WHEEL_MOVED_UP:
+                    case MouseEvent::WHEEL_MOVED_UP:
                         (*it)->mouseWheelMovedUp(mouseEvent);
                         break;
-                    case gcn::MouseEvent::WHEEL_MOVED_DOWN:
+                    case MouseEvent::WHEEL_MOVED_DOWN:
                         (*it)->mouseWheelMovedDown(mouseEvent);
                         break;
-                    case gcn::MouseEvent::DRAGGED:
+                    case MouseEvent::DRAGGED:
                         (*it)->mouseDragged(mouseEvent);
                         break;
-                    case gcn::MouseEvent::CLICKED:
+                    case MouseEvent::CLICKED:
                         (*it)->mouseClicked(mouseEvent);
                         break;
                     default:
@@ -745,11 +691,11 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
                 break;
         }
 
-        const gcn::Widget *const swap = widget;
+        const Widget *const swap = widget;
         widget = parent;
         parent = swap->getParent();
 
-        if (type == gcn::MouseEvent::RELEASED)
+        if (type == MouseEvent::RELEASED)
             dragDrop.clear();
 
         // If a non modal focused widget has been reach
@@ -794,7 +740,7 @@ MouseEvent *Gui::createMouseEvent(Window *const widget)
         mouseX - x, mouseY - y, mClickCount);
 }
 
-void Gui::getAbsolutePosition(gcn::Widget *restrict widget,
+void Gui::getAbsolutePosition(Widget *restrict widget,
                               int &restrict x, int &restrict y)
 {
     x = 0;
@@ -836,32 +782,31 @@ void Gui::handleMouseInput()
 #endif
         switch (mouseInput.getType())
         {
-            case gcn::MouseInput::PRESSED:
+            case MouseInput::PRESSED:
                 handleMousePressed(mouseInput);
                 break;
-            case gcn::MouseInput::RELEASED:
+            case MouseInput::RELEASED:
                 handleMouseReleased(mouseInput);
                 break;
-            case gcn::MouseInput::MOVED:
+            case MouseInput::MOVED:
                 handleMouseMoved(mouseInput);
                 break;
-            case gcn::MouseInput::WHEEL_MOVED_DOWN:
+            case MouseInput::WHEEL_MOVED_DOWN:
                 handleMouseWheelMovedDown(mouseInput);
                 break;
-            case gcn::MouseInput::WHEEL_MOVED_UP:
+            case MouseInput::WHEEL_MOVED_UP:
                 handleMouseWheelMovedUp(mouseInput);
                 break;
             default:
-                throw GCN_EXCEPTION("Unknown mouse input type.");
                 break;
         }
     }
     BLOCK_END("Gui::handleMouseInput")
 }
 
-void Gui::handleMouseReleased(const gcn::MouseInput &mouseInput)
+void Gui::handleMouseReleased(const MouseInput &mouseInput)
 {
-    gcn::Widget *sourceWidget = getMouseEventSource(
+    Widget *sourceWidget = getMouseEventSource(
         mouseInput.getX(), mouseInput.getY());
 
     int sourceWidgetX, sourceWidgetY;
@@ -870,7 +815,7 @@ void Gui::handleMouseReleased(const gcn::MouseInput &mouseInput)
         if (sourceWidget != mFocusHandler->getLastWidgetPressed())
             mFocusHandler->setLastWidgetPressed(nullptr);
 
-        gcn::Widget *oldWidget = sourceWidget;
+        Widget *oldWidget = sourceWidget;
         sourceWidget = mFocusHandler->getDraggedWidget();
         if (oldWidget != sourceWidget)
         {
@@ -911,17 +856,17 @@ void Gui::handleMouseReleased(const gcn::MouseInput &mouseInput)
         mFocusHandler->setDraggedWidget(nullptr);
 }
 
-void Gui::addGlobalFocusListener(gcn::FocusListener* focusListener)
+void Gui::addGlobalFocusListener(FocusListener* focusListener)
 {
     mFocusListeners.push_back(focusListener);
 }
 
-void Gui::removeGlobalFocusListener(gcn::FocusListener* focusListener)
+void Gui::removeGlobalFocusListener(FocusListener* focusListener)
 {
     mFocusListeners.remove(focusListener);
 }
 
-void Gui::distributeGlobalFocusGainedEvent(const gcn::Event &focusEvent)
+void Gui::distributeGlobalFocusGainedEvent(const Event &focusEvent)
 {
     for (FocusListenerIterator iter = mFocusListeners.begin();
          iter != mFocusListeners.end();
@@ -931,7 +876,7 @@ void Gui::distributeGlobalFocusGainedEvent(const gcn::Event &focusEvent)
     }
 }
 
-void Gui::removeDragged(gcn::Widget *widget)
+void Gui::removeDragged(Widget *widget)
 {
     if (!mFocusHandler)
         return;
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 5fddc7df7..4038bbec4 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -23,18 +23,19 @@
 #ifndef GUI_GUI_H
 #define GUI_GUI_H
 
-#include <guichan/color.hpp>
-#include <guichan/focuslistener.hpp>
-#include <guichan/gui.hpp>
+#include "gui/color.h"
+
+#include "gui/base/gui.hpp"
 
 #include "localconsts.h"
 
+class FocusListener;
 class Graphics;
 class GuiConfigListener;
 class ImageSet;
 class MouseEvent;
 class MouseInput;
-class SDLFont;
+class Font;
 class SDLInput;
 class Window;
 
@@ -89,38 +90,38 @@ class Gui final : public gcn::Gui
          */
         void videoResized() const;
 
-        gcn::FocusHandler *getFocusHandler() const A_WARN_UNUSED
+        FocusHandler *getFocusHandler() const A_WARN_UNUSED
         { return mFocusHandler; }
 
         /**
          * Return game font.
          */
-        SDLFont *getFont() const A_WARN_UNUSED
+        Font *getFont() const A_WARN_UNUSED
         { return mGuiFont; }
 
         /**
          * Return help font.
          */
-        SDLFont *getHelpFont() const A_WARN_UNUSED
+        Font *getHelpFont() const A_WARN_UNUSED
         { return mHelpFont; }
 
         /**
          * Return secure font.
          */
-        SDLFont *getSecureFont() const A_WARN_UNUSED
+        Font *getSecureFont() const A_WARN_UNUSED
         { return mSecureFont; }
 
         /**
          * Return npc font.
          */
-        SDLFont *getNpcFont() const A_WARN_UNUSED
+        Font *getNpcFont() const A_WARN_UNUSED
         { return mNpcFont; }
 
         /**
          * Return the Font used for "Info Particles", i.e. ones showing, what
          * you picked up, etc.
          */
-        SDLFont *getInfoParticleFont() const A_WARN_UNUSED
+        Font *getInfoParticleFont() const A_WARN_UNUSED
         { return mInfoParticleFont; }
 
         /**
@@ -147,17 +148,17 @@ class Gui final : public gcn::Gui
 
         MouseEvent *createMouseEvent(Window *const widget) A_WARN_UNUSED;
 
-        static void getAbsolutePosition(gcn::Widget *restrict widget,
+        static void getAbsolutePosition(Widget *restrict widget,
                                         int &restrict x,
                                         int &restrict y);
 
-        void addGlobalFocusListener(gcn::FocusListener* focusListener);
+        void addGlobalFocusListener(FocusListener* focusListener);
 
-        void removeGlobalFocusListener(gcn::FocusListener* focusListener);
+        void removeGlobalFocusListener(FocusListener* focusListener);
 
-        void distributeGlobalFocusGainedEvent(const gcn::Event &focusEvent);
+        void distributeGlobalFocusGainedEvent(const Event &focusEvent);
 
-        void removeDragged(gcn::Widget *widget);
+        void removeDragged(Widget *widget);
 
         int getLastMouseX() const
         { return mLastMouseX; }
@@ -168,25 +169,25 @@ class Gui final : public gcn::Gui
         static uint32_t getMouseState(int *const x, int *const y);
 
     protected:
-        void handleMouseMoved(const gcn::MouseInput &mouseInput);
+        void handleMouseMoved(const MouseInput &mouseInput);
 
-        void handleMouseReleased(const gcn::MouseInput &mouseInput);
+        void handleMouseReleased(const MouseInput &mouseInput);
 
-        void handleMousePressed(const gcn::MouseInput &mouseInput);
+        void handleMousePressed(const MouseInput &mouseInput);
 
         void handleMouseInput();
 
-        void distributeMouseEvent(gcn::Widget* source, int type, int button,
+        void distributeMouseEvent(Widget* source, int type, int button,
                                   int x, int y, bool force = false,
                                   bool toSourceOnly = false);
 
     private:
         GuiConfigListener *mConfigListener;
-        SDLFont *mGuiFont;                  /**< The global GUI font */
-        SDLFont *mInfoParticleFont;         /**< Font for Info Particles */
-        SDLFont *mHelpFont;                 /**< Font for Help Window */
-        SDLFont *mSecureFont;               /**< Font for secure labels */
-        SDLFont *mNpcFont;                  /**< Font for npc text */
+        Font *mGuiFont;                  /**< The global GUI font */
+        Font *mInfoParticleFont;         /**< Font for Info Particles */
+        Font *mHelpFont;                 /**< Font for Help Window */
+        Font *mSecureFont;               /**< Font for secure labels */
+        Font *mNpcFont;                  /**< Font for npc text */
         ImageSet *mMouseCursors;            /**< Mouse cursor images */
         float mMouseCursorAlpha;
         int mMouseInactivityTimer;
@@ -195,11 +196,11 @@ class Gui final : public gcn::Gui
         uint16_t mLastMouseRealX;
         uint16_t mLastMouseRealY;
 #endif
-        typedef std::list<gcn::FocusListener*> FocusListenerList;
+        typedef std::list<FocusListener*> FocusListenerList;
         typedef FocusListenerList::iterator FocusListenerIterator;
         FocusListenerList mFocusListeners;
-        gcn::Color mForegroundColor;
-        gcn::Color mForegroundColor2;
+        Color mForegroundColor;
+        Color mForegroundColor2;
         int mTime;
         bool mCustomCursor;                 /**< Show custom cursor */
         bool mDoubleClick;
@@ -211,6 +212,6 @@ extern SDLInput *guiInput;                  /**< GUI input */
 /**
  * Bolded text font
  */
-extern SDLFont *boldFont;
+extern Font *boldFont;
 
 #endif  // GUI_GUI_H
diff --git a/src/gui/models/avatarlistmodel.h b/src/gui/models/avatarlistmodel.h
new file mode 100644
index 000000000..2bbd64878
--- /dev/null
+++ b/src/gui/models/avatarlistmodel.h
@@ -0,0 +1,40 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_AVATARLISTMODEL_H
+#define GUI_MODELS_AVATARLISTMODEL_H
+
+#include "avatar.h"
+
+#include "gui/models/listmodel.h"
+
+#include <string>
+
+class AvatarListModel : public ListModel
+{
+    public:
+        virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
+
+        std::string getElementAt(int i) override final A_WARN_UNUSED
+        { return getAvatarAt(i)->getName(); }
+};
+
+#endif  // GUI_MODELS_AVATARLISTMODEL_H
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
new file mode 100644
index 000000000..9f3c48bcc
--- /dev/null
+++ b/src/gui/models/beingslistmodel.h
@@ -0,0 +1,62 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_BEINGSLISTMODEL_H
+#define GUI_MODELS_BEINGSLISTMODEL_H
+
+#include "gui/models/avatarlistmodel.h"
+
+class BeingsListModel final : public AvatarListModel
+{
+    public:
+        BeingsListModel() :
+            AvatarListModel(),
+            mMembers()
+        {
+        }
+
+        A_DELETE_COPY(BeingsListModel)
+
+        ~BeingsListModel()
+        {
+            delete_all(mMembers);
+            mMembers.clear();
+        }
+
+        std::vector<Avatar*> *getMembers()
+        {
+            return &mMembers;
+        }
+
+        Avatar *getAvatarAt(int index) override final
+        {
+            return mMembers[index];
+        }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(mMembers.size());
+        }
+
+        std::vector<Avatar*> mMembers;
+};
+
+#endif  // GUI_MODELS_BEINGSLISTMODEL_H
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
new file mode 100644
index 000000000..d4b2e4237
--- /dev/null
+++ b/src/gui/models/colorlistmodel.h
@@ -0,0 +1,81 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_COLORLISTMODEL_H
+#define GUI_MODELS_COLORLISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+const char *COLOR_NAME[14] =
+{
+    // TRANSLATORS: chat color
+    N_("default"),
+    // TRANSLATORS: chat color
+    N_("black"),
+    // TRANSLATORS: chat color
+    N_("red"),
+    // TRANSLATORS: chat color
+    N_("green"),
+    // TRANSLATORS: chat color
+    N_("blue"),
+    // TRANSLATORS: chat color
+    N_("gold"),
+    // TRANSLATORS: chat color
+    N_("yellow"),
+    // TRANSLATORS: chat color
+    N_("pink"),
+    // TRANSLATORS: chat color
+    N_("purple"),
+    // TRANSLATORS: chat color
+    N_("grey"),
+    // TRANSLATORS: chat color
+    N_("brown"),
+    // TRANSLATORS: chat color
+    N_("rainbow 1"),
+    // TRANSLATORS: chat color
+    N_("rainbow 2"),
+    // TRANSLATORS: chat color
+    N_("rainbow 3"),
+};
+
+class ColorListModel final : public ListModel
+{
+    public:
+        ~ColorListModel()
+        { }
+
+        int getNumberOfElements()
+        {
+            return 14;
+        }
+
+        std::string getElementAt(int i)
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+            return gettext(COLOR_NAME[i]);
+        }
+};
+
+#endif  // GUI_MODELS_COLORLISTMODEL_H
diff --git a/src/gui/widgets/colormodel.cpp b/src/gui/models/colormodel.cpp
index 7e59553e3..47486d735 100644
--- a/src/gui/widgets/colormodel.cpp
+++ b/src/gui/models/colormodel.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/colormodel.h"
+#include "gui/models/colormodel.h"
 
 #include "gui/widgets/widget2.h"
 
@@ -56,8 +56,8 @@ const ColorPair *ColorModel::getColorAt(const int i) const
     return &mColors[i];
 }
 
-void ColorModel::add(const std::string &name, const gcn::Color *const color1,
-                     const gcn::Color *const color2)
+void ColorModel::add(const std::string &name, const Color *const color1,
+                     const Color *const color2)
 {
     mNames.push_back(name);
     mColors.push_back(ColorPair(color1, color2));
diff --git a/src/gui/widgets/colormodel.h b/src/gui/models/colormodel.h
index 8b9226159..f3d6f3617 100644
--- a/src/gui/widgets/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -18,31 +18,31 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_COLORMODEL_H
-#define GUI_WIDGETS_COLORMODEL_H
+#ifndef GUI_MODELS_COLORMODEL_H
+#define GUI_MODELS_COLORMODEL_H
 
 #include "utils/stringvector.h"
 
-#include <guichan/color.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include "localconsts.h"
 
+class Color;
 class Widget2;
 
 struct ColorPair
 {
-    ColorPair(const gcn::Color* c1, const gcn::Color* c2) :
+    ColorPair(const Color* c1, const Color* c2) :
         color1(c1),
         color2(c2)
     {
     }
 
-    const gcn::Color* color1;
-    const gcn::Color* color2;
+    const Color* color1;
+    const Color* color2;
 };
 
-class ColorModel : public gcn::ListModel
+class ColorModel : public ListModel
 {
     public:
         ColorModel();
@@ -63,8 +63,8 @@ class ColorModel : public gcn::ListModel
         size_t size() A_WARN_UNUSED
         { return mNames.size(); }
 
-        void add(const std::string &name, const gcn::Color *const color1,
-                 const gcn::Color *const color2);
+        void add(const std::string &name, const Color *const color1,
+                 const Color *const color2);
 
         static ColorModel *createDefault(const Widget2 *const widget);
 
@@ -73,4 +73,4 @@ class ColorModel : public gcn::ListModel
         std::vector<ColorPair> mColors;
 };
 
-#endif  // GUI_WIDGETS_COLORMODEL_H
+#endif  // GUI_MODELS_COLORMODEL_H
diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h
index 0299ef7ed..5d859e781 100644
--- a/src/gui/widgets/extendedlistmodel.h
+++ b/src/gui/models/extendedlistmodel.h
@@ -18,17 +18,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_EXTENDEDLISTMODEL_H
-#define GUI_WIDGETS_EXTENDEDLISTMODEL_H
+#ifndef GUI_MODELS_EXTENDEDLISTMODEL_H
+#define GUI_MODELS_EXTENDEDLISTMODEL_H
 
 #include "resources/image.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
-class ExtendedListModel : public gcn::ListModel
+class ExtendedListModel : public ListModel
 {
     public:
         virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0;
 };
 
-#endif  // GUI_WIDGETS_EXTENDEDLISTMODEL_H
+#endif  // GUI_MODELS_EXTENDEDLISTMODEL_H
diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp
index a8a21d98d..c986085db 100644
--- a/src/gui/widgets/extendednamesmodel.cpp
+++ b/src/gui/models/extendednamesmodel.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/extendednamesmodel.h"
+#include "gui/models/extendednamesmodel.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index 93e87cfa0..383a93951 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -18,12 +18,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_EXTENDEDNAMESMODEL_H
-#define GUI_WIDGETS_EXTENDEDNAMESMODEL_H
+#ifndef GUI_MODELS_EXTENDEDNAMESMODEL_H
+#define GUI_MODELS_EXTENDEDNAMESMODEL_H
 
 #include "utils/stringvector.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
 
 class ExtendedNamesModel : public ExtendedListModel
 {
@@ -56,4 +56,4 @@ class ExtendedNamesModel : public ExtendedListModel
         std::vector<Image*> mImages;
 };
 
-#endif  // GUI_WIDGETS_EXTENDEDNAMESMODEL_H
+#endif  // GUI_MODELS_EXTENDEDNAMESMODEL_H
diff --git a/src/input/keyinput.cpp b/src/gui/models/fontsmodel.h
index d04305e0e..036e3f9c4 100644
--- a/src/input/keyinput.cpp
+++ b/src/gui/models/fontsmodel.h
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012-2014  The ManaPlus Developers
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -18,21 +19,24 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input/keyinput.h"
+#ifndef GUI_MODELS_FONTSMODEL_H
+#define GUI_MODELS_FONTSMODEL_H
 
-#include "debug.h"
+#include "gui/theme.h"
 
-KeyInput::KeyInput() :
-    gcn::KeyInput(),
-#ifdef USE_SDL2
-    mActionId(-2),
-    mText()
-#else
-    mActionId(-2)
-#endif
-{
-}
+#include "gui/models/namesmodel.h"
+
+#include "localconsts.h"
 
-KeyInput::~KeyInput()
+class FontsModel final : public NamesModel
 {
-}
+    public:
+        FontsModel() :
+            NamesModel()
+        { Theme::fillFontsList(mNames); }
+
+        ~FontsModel()
+        { }
+};
+
+#endif  // GUI_MODELS_FONTSMODEL_H
diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h
new file mode 100644
index 000000000..c3031169c
--- /dev/null
+++ b/src/gui/models/iconsmodel.h
@@ -0,0 +1,84 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2014  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_MODELS_ICONSMODEL_H
+#define GUI_MODELS_ICONSMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "resources/iteminfo.h"
+
+#include "resources/db/itemdb.h"
+
+#include "localconsts.h"
+
+class IconsModel final : public ListModel
+{
+    public:
+        IconsModel() :
+            mStrings()
+        {
+            const std::map<int, ItemInfo*> &items = ItemDB::getItemInfos();
+            std::list<std::string> tempStrings;
+
+            for (std::map<int, ItemInfo*>::const_iterator
+                 i = items.begin(), i_end = items.end();
+                 i != i_end; ++i)
+            {
+                if (i->first < 0)
+                    continue;
+
+                const ItemInfo &info = (*i->second);
+                const std::string name = info.getName();
+                if (name != "unnamed" && !info.getName().empty()
+                    && info.getName() != "unnamed")
+                {
+                    tempStrings.push_back(name);
+                }
+            }
+            tempStrings.sort();
+            mStrings.push_back("");
+            FOR_EACH (std::list<std::string>::const_iterator, i, tempStrings)
+                mStrings.push_back(*i);
+        }
+
+        A_DELETE_COPY(IconsModel)
+
+        ~IconsModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(mStrings.size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i < 0 || i >= getNumberOfElements())
+                return "???";
+            return mStrings.at(i);
+        }
+    private:
+        StringVect mStrings;
+};
+
+#endif  // GUI_MODELS_ICONSMODEL_H
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
new file mode 100644
index 000000000..8ba3eadb1
--- /dev/null
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -0,0 +1,55 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_IGNORECHOICESLISTMODEL_H
+#define GUI_MODELS_IGNORECHOICESLISTMODEL_H
+
+#include "being/playerrelations.h"
+
+#include "gui/models/playerrelationlistmodel.h"
+
+/**
+ * Class for choosing one of the various `what to do when ignoring a player' options
+ */
+class IgnoreChoicesListModel final : public ListModel
+{
+    public:
+        ~IgnoreChoicesListModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(player_relations.
+                getPlayerIgnoreStrategies()->size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+
+            return (*player_relations.getPlayerIgnoreStrategies())
+                [i]->mDescription;
+        }
+};
+
+#endif  // GUI_MODELS_IGNORECHOICESLISTMODEL_H
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
new file mode 100644
index 000000000..808ae0f04
--- /dev/null
+++ b/src/gui/models/itemsmodel.h
@@ -0,0 +1,86 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_ITEMSMODEL_H
+#define GUI_MODELS_ITEMSMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "resources/iteminfo.h"
+
+#include "resources/db/itemdb.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+class ItemsModal final : public ListModel
+{
+    public:
+        ItemsModal() :
+            mStrings()
+        {
+            const std::map<int, ItemInfo*> &items = ItemDB::getItemInfos();
+            std::list<std::string> tempStrings;
+
+            for (std::map<int, ItemInfo*>::const_iterator
+                 i = items.begin(), i_end = items.end();
+                 i != i_end; ++i)
+            {
+                if (i->first < 0)
+                    continue;
+
+                const ItemInfo &info = *i->second;
+                const std::string name = info.getName();
+                if (name != "unnamed" && !info.getName().empty()
+                    && info.getName() != "unnamed")
+                {
+                    tempStrings.push_back(name);
+                }
+            }
+            tempStrings.sort();
+            FOR_EACH (std::list<std::string>::const_iterator, i, tempStrings)
+                mStrings.push_back(*i);
+        }
+
+        A_DELETE_COPY(ItemsModal)
+
+        ~ItemsModal()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(mStrings.size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i < 0 || i >= getNumberOfElements())
+                return "???";
+            return mStrings.at(i);
+        }
+
+    private:
+        StringVect mStrings;
+};
+
+#endif  // GUI_MODELS_ITEMSMODEL_H
diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/gui/models/listmodel.h
index 4b98f46fe..dfce6d4d5 100644
--- a/src/guichan/include/guichan/listmodel.hpp
+++ b/src/gui/models/listmodel.h
@@ -61,46 +61,43 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_LISTMODEL_HPP
-#define GCN_LISTMODEL_HPP
+#ifndef GUI_MODELS_LISTMODEL_H
+#define GUI_MODELS_LISTMODEL_H
 
 #include <string>
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * An interface for a model that represents a list. It is 
+  * used in certain widgets, like the ListBox, to handle a 
+  * lists with string elements. If you want to use widgets 
+  * like ListBox, make a derived class from this class that 
+  * represents your list.
+  */
+class ListModel
 {
-    /**
-     * An interface for a model that represents a list. It is 
-     * used in certain widgets, like the ListBox, to handle a 
-     * lists with string elements. If you want to use widgets 
-     * like ListBox, make a derived class from this class that 
-     * represents your list.
-     */
-    class ListModel
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~ListModel()
         { }
 
         /**
-         * Gets the number of elements in the list.
-         *
-         * @return The number of elements in the list
-         */
+          * Gets the number of elements in the list.
+          *
+          * @return The number of elements in the list
+          */
         virtual int getNumberOfElements() A_WARN_UNUSED = 0;
 
         /**
-         * Gets an element at a certain index in the list.
-         *
-         * @param i An index in the list.
-         * @return An element as a string at the a certain index.
-         */
+          * Gets an element at a certain index in the list.
+          *
+          * @param i An index in the list.
+          * @return An element as a string at the a certain index.
+          */
         virtual std::string getElementAt(int i) A_WARN_UNUSED = 0;
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_LISTMODEL_HPP
+#endif  // GUI_MODELS_LISTMODEL_H
diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h
new file mode 100644
index 000000000..1f7c4f0f7
--- /dev/null
+++ b/src/gui/models/magicschoolmodel.h
@@ -0,0 +1,67 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2014  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_MODELS_MAGICSCHOOLMODEL_H
+#define GUI_MODELS_MAGICSCHOOLMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+const char *MAGIC_SCHOOL_TEXT[6] =
+{
+    // TRANSLATORS: magic school
+    N_("General Magic"),
+    // TRANSLATORS: magic school
+    N_("Life Magic"),
+    // TRANSLATORS: magic school
+    N_("War Magic"),
+    // TRANSLATORS: magic school
+    N_("Transmute Magic"),
+    // TRANSLATORS: magic school
+    N_("Nature Magic"),
+    // TRANSLATORS: magic school
+    N_("Astral Magic")
+};
+
+class MagicSchoolModel final : public ListModel
+{
+    public:
+        ~MagicSchoolModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return 6;
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+            return MAGIC_SCHOOL_TEXT[i];
+        }
+};
+
+#endif  // GUI_MODELS_MAGICSCHOOLMODEL_H
diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/models/namesmodel.cpp
index 339f835d5..54a10c2cf 100644
--- a/src/gui/widgets/namesmodel.cpp
+++ b/src/gui/models/namesmodel.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/namesmodel.h"
+#include "gui/models/namesmodel.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/models/namesmodel.h
index f70dd2571..96d16de36 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/models/namesmodel.h
@@ -18,16 +18,16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_NAMESMODEL_H
-#define GUI_WIDGETS_NAMESMODEL_H
+#ifndef GUI_MODELS_NAMESMODEL_H
+#define GUI_MODELS_NAMESMODEL_H
 
 #include "utils/stringvector.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include "localconsts.h"
 
-class NamesModel : public gcn::ListModel
+class NamesModel : public ListModel
 {
     public:
         NamesModel();
@@ -58,4 +58,4 @@ class NamesModel : public gcn::ListModel
         StringVect mNames;
 };
 
-#endif  // GUI_WIDGETS_NAMESMODEL_H
+#endif  // GUI_MODELS_NAMESMODEL_H
diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h
new file mode 100644
index 000000000..bc343de02
--- /dev/null
+++ b/src/gui/models/playerrelationlistmodel.h
@@ -0,0 +1,67 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_PLAYERRELATIONLISTMODEL_H
+#define GUI_MODELS_PLAYERRELATIONLISTMODEL_H
+
+#include "being/playerrelations.h"
+
+#include "utils/gettext.h"
+
+static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
+{
+    // TRANSLATORS: relation type
+    N_("Neutral"),
+    // TRANSLATORS: relation type
+    N_("Friend"),
+    // TRANSLATORS: relation type
+    N_("Disregarded"),
+    // TRANSLATORS: relation type
+    N_("Ignored"),
+    // TRANSLATORS: relation type
+    N_("Erased"),
+    // TRANSLATORS: relation type
+    N_("Blacklisted"),
+    // TRANSLATORS: relation type
+    N_("Enemy")
+};
+
+class PlayerRelationListModel final : public ListModel
+{
+    public:
+        ~PlayerRelationListModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return PlayerRelation::RELATIONS_NR;
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "";
+            return gettext(RELATION_NAMES[i]);
+        }
+};
+
+#endif  // GUI_MODELS_PLAYERRELATIONLISTMODEL_H
diff --git a/src/mouseinput.cpp b/src/gui/models/questsmodel.h
index 208690935..d9421f402 100644
--- a/src/mouseinput.cpp
+++ b/src/gui/models/questsmodel.h
@@ -18,17 +18,23 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mouseinput.h"
+#ifndef GUI_MODELS_QUESTSMODEL_H
+#define GUI_MODELS_QUESTSMODEL_H
 
-#include "debug.h"
+#include "gui/models/extendednamesmodel.h"
 
-MouseInput::MouseInput() :
-    gcn::MouseInput(),
-    mRealX(0),
-    mRealY(0)
+class QuestsModel final : public ExtendedNamesModel
 {
-}
+    public:
+        QuestsModel() :
+            ExtendedNamesModel()
+        {
+        }
 
-MouseInput::~MouseInput()
-{
-}
+        A_DELETE_COPY(QuestsModel)
+
+        ~QuestsModel()
+        { }
+};
+
+#endif  // GUI_MODELS_QUESTSMODEL_H
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
new file mode 100644
index 000000000..630d9664e
--- /dev/null
+++ b/src/gui/models/serverslistmodel.h
@@ -0,0 +1,109 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_SERVERSLISTMODEL_H
+#define GUI_MODELS_SERVERSLISTMODEL_H
+
+#include "net/serverinfo.h"
+
+#include "utils/mutex.h"
+
+#include "gui/models/listmodel.h"
+
+#include "net/serverinfo.h"
+
+#include <string>
+#include <vector>
+
+class ServerDialog;
+
+/**
+ * Server and Port List Model
+ */
+class ServersListModel final : public ListModel
+{
+    public:
+        typedef std::pair<int, std::string> VersionString;
+
+        ServersListModel(ServerInfos *const servers,
+                         ServerDialog *const parent) :
+            mServers(servers),
+            mVersionStrings(servers->size(), VersionString(0, "")),
+            mParent(parent)
+        {
+        }
+
+        A_DELETE_COPY(ServersListModel)
+
+        /**
+         * Used to get number of line in the list
+         */
+        int getNumberOfElements() override final A_WARN_UNUSED
+        {
+            MutexLocker lock = mParent->lock();
+            return static_cast<int>(mServers->size());
+        }
+
+        /**
+         * Used to get an element from the list
+         */
+        std::string getElementAt(int elementIndex)
+                                 override final A_WARN_UNUSED
+        {
+            MutexLocker lock = mParent->lock();
+            const ServerInfo &server = mServers->at(elementIndex);
+            std::string myServer;
+            myServer.append(server.hostname);
+            return myServer;
+        }
+
+        /**
+         * Used to get the corresponding Server struct
+         */
+        const ServerInfo &getServer(const int elementIndex) const A_WARN_UNUSED
+        { return mServers->at(elementIndex); }
+
+        void setVersionString(const int index, const std::string &version)
+        {
+            if (index < 0 || index >= static_cast<int>(mVersionStrings.size()))
+            return;
+
+            if (version.empty() || !gui)
+            {
+                mVersionStrings[index] = VersionString(0, "");
+            }
+            else
+            {
+                mVersionStrings[index] = VersionString(
+                    gui->getFont()->getWidth(version), version);
+            }
+        }
+
+    private:
+        typedef std::vector<VersionString> VersionStrings;
+
+        ServerInfos *mServers;
+        VersionStrings mVersionStrings;
+        ServerDialog *mParent;
+};
+
+#endif  // GUI_MODELS_SERVERSLISTMODEL_H
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/models/shopitems.cpp
index 2ac65253d..492409e76 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/shopitems.h"
+#include "gui/models/shopitems.h"
 
 #include "shopitem.h"
 
diff --git a/src/gui/widgets/shopitems.h b/src/gui/models/shopitems.h
index 4803d6fed..925354960 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_SHOPITEMS_H
-#define GUI_WIDGETS_SHOPITEMS_H
+#ifndef GUI_MODELS_SHOPITEMS_H
+#define GUI_MODELS_SHOPITEMS_H
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include <string>
 #include <vector>
@@ -41,7 +41,7 @@ class ShopItem;
  *
  * This functionality can be enabled in the constructor.
  */
-class ShopItems final : public gcn::ListModel
+class ShopItems final : public ListModel
 {
     public:
         /**
@@ -138,4 +138,4 @@ class ShopItems final : public gcn::ListModel
         bool mMergeDuplicates;
 };
 
-#endif  // GUI_WIDGETS_SHOPITEMS_H
+#endif  // GUI_MODELS_SHOPITEMS_H
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/models/skillmodel.cpp
index 3244feec4..706bbdee2 100644
--- a/src/gui/widgets/skillmodel.cpp
+++ b/src/gui/models/skillmodel.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/skillmodel.h"
+#include "gui/models/skillmodel.h"
 
 #include "gui/widgets/skilldata.h"
 
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/models/skillmodel.h
index 0f77dccfe..11746118e 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/models/skillmodel.h
@@ -20,17 +20,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_SKILLMODEL_H
-#define GUI_WIDGETS_SKILLMODEL_H
+#ifndef GUI_MODELS_SKILLMODEL_H
+#define GUI_MODELS_SKILLMODEL_H
 
 #include "gui/widgets/skillinfo.h"
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include <string>
 
 #include "localconsts.h"
 
-class SkillModel final : public gcn::ListModel
+class SkillModel final : public ListModel
 {
     public:
         SkillModel();
@@ -52,4 +52,4 @@ class SkillModel final : public gcn::ListModel
         SkillList mVisibleSkills;
 };
 
-#endif  // GUI_WIDGETS_SKILLMODEL_H
+#endif  // GUI_MODELS_SKILLMODEL_H
diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h
new file mode 100644
index 000000000..1647ae822
--- /dev/null
+++ b/src/gui/models/sortlistmodelbuy.h
@@ -0,0 +1,65 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_SORTLISTMODELBUY_H
+#define GUI_MODELS_SORTLISTMODELBUY_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+static const char *const SORT_NAME_BUY[7] =
+{
+    // TRANSLATORS: buy dialog sort type.
+    N_("unsorted"),
+    // TRANSLATORS: buy dialog sort type.
+    N_("by price"),
+    // TRANSLATORS: buy dialog sort type.
+    N_("by name"),
+    // TRANSLATORS: buy dialog sort type.
+    N_("by id"),
+    // TRANSLATORS: buy dialog sort type.
+    N_("by weight"),
+    // TRANSLATORS: buy dialog sort type.
+    N_("by amount"),
+    // TRANSLATORS: buy dialog sort type.
+    N_("by type")
+};
+
+class SortListModelBuy final : public ListModel
+{
+    public:
+        ~SortListModelBuy()
+        { }
+
+        int getNumberOfElements()
+        { return 7; }
+
+        std::string getElementAt(int i)
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+            return gettext(SORT_NAME_BUY[i]);
+        }
+};
+
+#endif  // GUI_MODELS_SORTLISTMODELBUY_H
diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h
new file mode 100644
index 000000000..ae0982af6
--- /dev/null
+++ b/src/gui/models/sortlistmodelinv.h
@@ -0,0 +1,65 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_SORTLISTMODELINV_H
+#define GUI_MODELS_SORTLISTMODELINV_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+#include <string>
+
+static const char *const SORT_NAME_INVENTORY[6] =
+{
+    // TRANSLATORS: inventory sort mode
+    N_("default"),
+    // TRANSLATORS: inventory sort mode
+    N_("by name"),
+    // TRANSLATORS: inventory sort mode
+    N_("by id"),
+    // TRANSLATORS: inventory sort mode
+    N_("by weight"),
+    // TRANSLATORS: inventory sort mode
+    N_("by amount"),
+    // TRANSLATORS: inventory sort mode
+    N_("by type")
+};
+
+class SortListModelInv final : public ListModel
+{
+    public:
+        ~SortListModelInv()
+        { }
+
+        int getNumberOfElements() override final
+        { return 6; }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+
+            return gettext(SORT_NAME_INVENTORY[i]);
+        }
+};
+
+#endif  // GUI_MODELS_SORTLISTMODELINV_H
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/models/soundsmodel.h
index b7c0cc94c..3ac679d37 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/models/soundsmodel.h
@@ -19,30 +19,29 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_MOUSEEVENT_H
-#define GUI_WIDGETS_MOUSEEVENT_H
+#ifndef GUI_MODELS_SOUNDSMODEL_H
+#define GUI_MODELS_SOUNDSMODEL_H
 
-#include <guichan/mouseevent.hpp>
-#include <guichan/widget.hpp>
+#include "gui/theme.h"
 
-class MouseEvent final : public gcn::MouseEvent
+#include "gui/models/namesmodel.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+class SoundsModel final : public NamesModel
 {
     public:
-        MouseEvent(gcn::Widget* source, bool shiftPressed,
-                   bool controlPressed, bool altPressed,
-                   bool metaPressed, unsigned int type, unsigned int button,
-                   int x, int y, int clickCount) :
-            gcn::MouseEvent(source, shiftPressed, controlPressed,
-                            altPressed, metaPressed, type, button, x, y,
-                            clickCount)
+        SoundsModel() :
+            NamesModel()
         {
+            mNames.push_back(gettext("(no sound)"));
+            Theme::fillSoundsList(mNames);
         }
 
-        void setX(int n)
-        { mX = n; }
-
-        void setY(int n)
-        { mY = n; }
+        ~SoundsModel()
+        { }
 };
 
-#endif  // GUI_WIDGETS_MOUSEEVENT_H
+#endif  // GUI_MODELS_SOUNDSMODEL_H
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/models/tablemodel.cpp
index f244f51f4..aad66a6ad 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/models/tablemodel.cpp
@@ -20,11 +20,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/tablemodel.h"
+#include "gui/models/tablemodel.h"
 
 #include "utils/dtor.h"
 
-#include <guichan/widget.hpp>
+#include "gui/widgets/widget.h"
 
 #include "debug.h"
 
@@ -89,7 +89,7 @@ void StaticTableModel::resize()
 }
 
 void StaticTableModel::set(const int row, const int column,
-                           gcn::Widget *const widget)
+                           Widget *const widget)
 {
     if (!widget || row >= mRows || row < 0
         || column >= mColumns || column < 0)
@@ -119,8 +119,8 @@ void StaticTableModel::set(const int row, const int column,
     signalAfterUpdate();
 }
 
-gcn::Widget *StaticTableModel::getElementAt(const int row,
-                                            const int column) const
+Widget *StaticTableModel::getElementAt(const int row,
+                                       const int column) const
 {
     return mTableModel[WIDGET_AT(row, column)];
 }
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/models/tablemodel.h
index 1273c6873..032facadd 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -20,18 +20,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_TABLEMODEL_H
-#define GUI_WIDGETS_TABLEMODEL_H
+#ifndef GUI_MODELS_TABLEMODEL_H
+#define GUI_MODELS_TABLEMODEL_H
 
 #include <set>
 #include <vector>
 
 #include "localconsts.h"
 
-namespace gcn
-{
-    class Widget;
-}
+class Widget;
 
 class TableModelListener
 {
@@ -83,7 +80,7 @@ public:
     /**
      * Retrieves the widget stored at the specified location within the table.
      */
-    virtual gcn::Widget *getElementAt(const int row, const int column)
+    virtual Widget *getElementAt(const int row, const int column)
                                       const A_WARN_UNUSED = 0;
 
     virtual void installListener(TableModelListener *const listener);
@@ -125,7 +122,7 @@ public:
      * The model is resized to accomodate the widget's width and height,
      * unless column width / row height have been fixed.
      */
-    void set(const int row, const int column, gcn::Widget *const widget);
+    void set(const int row, const int column, Widget *const widget);
 
     /**
      * Fixes the column width for a given column; this overrides dynamic width
@@ -153,15 +150,14 @@ public:
     int getWidth() const A_WARN_UNUSED;
     int getHeight() const A_WARN_UNUSED;
     int getColumnWidth(const int index) const override final A_WARN_UNUSED;
-    gcn::Widget *getElementAt(const int row,
-                              const int column) const
-                              override final A_WARN_UNUSED;
+    Widget *getElementAt(const int row,
+                         const int column) const override final A_WARN_UNUSED;
 
 protected:
     int mRows, mColumns;
     int mHeight;
-    std::vector<gcn::Widget *> mTableModel;
+    std::vector<Widget *> mTableModel;
     std::vector<int> mWidths;
 };
 
-#endif  // GUI_WIDGETS_TABLEMODEL_H
+#endif  // GUI_MODELS_TABLEMODEL_H
diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h
new file mode 100644
index 000000000..d049585a5
--- /dev/null
+++ b/src/gui/models/targettypemodel.h
@@ -0,0 +1,58 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2014  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_MODELS_TARGETTYPEMODEL_H
+#define GUI_MODELS_TARGETTYPEMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+const char *TARGET_TYPE_TEXT[3] =
+{
+    // TRANSLATORS: target type
+    N_("No Target"),
+    // TRANSLATORS: target type
+    N_("Allow Target"),
+    // TRANSLATORS: target type
+    N_("Need Target")
+};
+
+class TargetTypeModel final : public ListModel
+{
+    public:
+        ~TargetTypeModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return 3;
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+            return TARGET_TYPE_TEXT[i];
+        }
+};
+
+#endif  // GUI_MODELS_TARGETTYPEMODEL_H
diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h
new file mode 100644
index 000000000..7f76534f0
--- /dev/null
+++ b/src/gui/models/themesmodel.h
@@ -0,0 +1,47 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2014  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_MODELS_THEMESMODEL_H
+#define GUI_MODELS_THEMESMODEL_H
+
+#include "gui/theme.h"
+
+#include "gui/models/namesmodel.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+class ThemesModel final : public NamesModel
+{
+    public:
+        ThemesModel() :
+            NamesModel()
+        {
+            mNames.push_back(gettext("(default)"));
+            Theme::fillSkinsList(mNames);
+        }
+
+        ~ThemesModel()
+        { }
+};
+
+#endif  // GUI_MODELS_THEMESMODEL_H
diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp
new file mode 100644
index 000000000..b32d1479f
--- /dev/null
+++ b/src/gui/models/touchactionmodel.cpp
@@ -0,0 +1,84 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2014  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/setupactiondata.h"
+
+#include "gui/models/touchactionmodel.h"
+
+#include <algorithm>
+
+#include "debug.h"
+
+static class SortTouchActionFunctor final
+{
+    public:
+        bool operator() (const SetupActionData *const data1,
+                         const SetupActionData *const data2) const
+        {
+            if (!data1 || !data2)
+                return false;
+            return data1->name < data2->name;
+        }
+} touchActionSorter;
+
+TouchActionsModel::TouchActionsModel() :
+    NamesModel(),
+    mActionId(),
+    mActionToSelection()
+{
+    std::vector<SetupActionData*> data;
+
+    for (int f = 0, sz = touchActionDataSize; f < sz; f ++)
+    {
+        int k = 0;
+        while (!touchActionData[f][k].name.empty())
+        {
+            data.push_back(&touchActionData[f][k]);
+            k ++;
+        }
+    }
+
+    std::sort(data.begin(), data.end(), touchActionSorter);
+    int cnt = 0;
+    FOR_EACH (std::vector<SetupActionData*>::iterator, it, data)
+    {
+        const SetupActionData *const data1 = *it;
+        mNames.push_back(data1->name);
+        mActionId.push_back(data1->actionId);
+        mActionToSelection[data1->actionId] = cnt;
+        cnt ++;
+    }
+}
+
+int TouchActionsModel::getActionFromSelection(const int sel) const
+{
+    if (sel < 0 || sel > static_cast<signed int>(mActionId.size()))
+        return -1;
+    return mActionId[sel];
+}
+
+int TouchActionsModel::getSelectionFromAction(const int action) const
+{
+    const std::map<int, int>::const_iterator it
+        = mActionToSelection.find(action);
+    if (it == mActionToSelection.end())
+        return 0;
+    return (*it).second;
+}
diff --git a/src/input/keyevent.cpp b/src/gui/models/touchactionmodel.h
index 5695cd99b..00abe89e2 100644
--- a/src/input/keyevent.cpp
+++ b/src/gui/models/touchactionmodel.h
@@ -18,30 +18,30 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input/keyevent.h"
-
-#include "debug.h"
-
-KeyEvent::KeyEvent(gcn::Widget *const source,
-                   const bool shiftPressed,
-                   const bool controlPressed,
-                   const bool altPressed,
-                   const bool metaPressed,
-                   const unsigned int type,
-                   const bool numericPad,
-                   const int actionId,
-                   const gcn::Key& key) :
-    gcn::KeyEvent(source, shiftPressed, controlPressed, altPressed,
-                  metaPressed, type, numericPad, key),
-#ifdef USE_SDL2
-    mActionId(actionId),
-    mText()
-#else
-    mActionId(actionId)
-#endif
-{
-}
+#ifndef GUI_MODELS_TOUCHACTIONMODEL_H
+#define GUI_MODELS_TOUCHACTIONMODEL_H
+
+#include "gui/models/namesmodel.h"
+
+#include "gui/widgets/setupitem.h"
 
-KeyEvent::~KeyEvent()
+class TouchActionsModel final : public NamesModel
 {
-}
+    public:
+        TouchActionsModel();
+
+        A_DELETE_COPY(TouchActionsModel)
+
+        ~TouchActionsModel()
+        { }
+
+        int getActionFromSelection(const int sel) const;
+
+        int getSelectionFromAction(const int action) const;
+
+    private:
+        std::vector<int> mActionId;
+        std::map<int, int> mActionToSelection;
+};
+
+#endif  // GUI_MODELS_TOUCHACTIONMODEL_H
diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h
new file mode 100644
index 000000000..f9c005f8f
--- /dev/null
+++ b/src/gui/models/typelistmodel.h
@@ -0,0 +1,65 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2011-2012  The Mana Developers
+ *  Copyright (C) 2012-2014  The ManaPlus Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_MODELS_TYPELISTMODEL_H
+#define GUI_MODELS_TYPELISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+/**
+ * Server Type List Model
+ */
+class TypeListModel : public ListModel
+{
+    public:
+        TypeListModel()
+        { }
+
+        /**
+         * Used to get number of line in the list
+         */
+        int getNumberOfElements() override final A_WARN_UNUSED
+#ifdef EATHENA_SUPPORT
+        { return 3; }
+#else
+        { return 2; }
+#endif
+
+        /**
+         * Used to get an element from the list
+         */
+        std::string getElementAt(int elementIndex)
+                                 override final A_WARN_UNUSED
+        {
+            if (elementIndex == 0)
+                return "TmwAthena";
+            else if (elementIndex == 1)
+                return "Evol";
+#ifdef EATHENA_SUPPORT
+            else if (elementIndex == 2)
+                return "eAthena";
+#endif
+            else
+                return "Unknown";
+        }
+};
+
+#endif  // GUI_MODELS_TYPELISTMODEL_H
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
new file mode 100644
index 000000000..2e1d2a7d5
--- /dev/null
+++ b/src/gui/models/updatelistmodel.h
@@ -0,0 +1,66 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_UPDATELISTMODEL_H
+#define GUI_MODELS_UPDATELISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "net/logindata.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+class UpdateListModel final : public ListModel
+{
+    public:
+        explicit UpdateListModel(LoginData *const data) :
+            ListModel(),
+            mLoginData(data)
+        {
+        }
+
+        A_DELETE_COPY(UpdateListModel)
+
+        ~UpdateListModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            if (!mLoginData)
+                return 0;
+            return static_cast<int>(mLoginData->updateHosts.size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (!mLoginData || i >= getNumberOfElements() || i < 0)
+                return "???";
+            return mLoginData->updateHosts[i];
+        }
+
+    protected:
+        LoginData *mLoginData;
+};
+
+#endif  // GUI_MODELS_UPDATELISTMODEL_H
diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h
new file mode 100644
index 000000000..f96c11e87
--- /dev/null
+++ b/src/gui/models/updatetypemodel.h
@@ -0,0 +1,63 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_UPDATETYPEMODEL_H
+#define GUI_MODELS_UPDATETYPEMODEL_H
+
+#include "utils/gettext.h"
+
+#include "gui/models/listmodel.h"
+
+const char *UPDATE_TYPE_TEXT[3] =
+{
+    // TRANSLATORS: update type
+    N_("Normal"),
+    // TRANSLATORS: update type
+    N_("Auto Close"),
+    // TRANSLATORS: update type
+    N_("Skip"),
+};
+
+class UpdateTypeModel final : public ListModel
+{
+    public:
+        UpdateTypeModel()
+        { }
+
+        A_DELETE_COPY(UpdateTypeModel)
+
+        ~UpdateTypeModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return 3;
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+            return gettext(UPDATE_TYPE_TEXT[i]);
+        }
+};
+
+#endif  // GUI_MODELS_UPDATETYPEMODEL_H
diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h
new file mode 100644
index 000000000..7d9dc322c
--- /dev/null
+++ b/src/gui/models/worldlistmodel.h
@@ -0,0 +1,68 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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_MODELS_WORLDLISTMODEL_H
+#define GUI_MODELS_WORLDLISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "net/worldinfo.h"
+
+/**
+ * The list model for the server list.
+ */
+class WorldListModel final : public ListModel
+{
+    public:
+        explicit WorldListModel(Worlds worlds) :
+            mWorlds(worlds)
+        {
+        }
+
+        A_DELETE_COPY(WorldListModel)
+
+        ~WorldListModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(mWorlds.size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            const WorldInfo *const si = mWorlds[i];
+            if (si)
+            {
+                return std::string(si->name).append(" (").append(
+                    toString(si->online_users)).append(")");
+            }
+            else
+            {
+                return "???";
+            }
+        }
+    private:
+        Worlds mWorlds;
+};
+
+#endif  // GUI_MODELS_WORLDLISTMODEL_H
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 9d6c19095..21e027d82 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -29,18 +29,18 @@
 
 #include "debug.h"
 
-const gcn::Color Palette::BLACK = gcn::Color(0, 0, 0);
+const Color Palette::BLACK = Color(0, 0, 0);
 Palette::Palettes Palette::mInstances;
 
-const gcn::Color Palette::RAINBOW_COLORS[7] =
+const Color Palette::RAINBOW_COLORS[7] =
 {
-    gcn::Color(255, 0, 0),
-    gcn::Color(255, 153, 0),
-    gcn::Color(255, 255, 0),
-    gcn::Color(0, 153, 0),
-    gcn::Color(0, 204, 204),
-    gcn::Color(51, 0, 153),
-    gcn::Color(153, 0, 153)
+    Color(255, 0, 0),
+    Color(255, 153, 0),
+    Color(255, 255, 0),
+    Color(0, 153, 0),
+    Color(0, 204, 204),
+    Color(51, 0, 153),
+    Color(153, 0, 153)
 };
 
 const int Palette::RAINBOW_COLOR_COUNT = 7;
@@ -59,7 +59,7 @@ Palette::~Palette()
     mInstances.erase(this);
 }
 
-const gcn::Color& Palette::getCharColor(const signed char c, bool &valid) const
+const Color& Palette::getCharColor(const signed char c, bool &valid) const
 {
     const CharColors::const_iterator it = mCharColors.find(c);
     if (it != mCharColors.end())
@@ -128,7 +128,7 @@ void Palette::advanceGradient()
             else
                 colIndex = gradIndex;
 
-            gcn::Color &color = elem->color;
+            Color &color = elem->color;
             int colVal;
 
             if (grad == PULSE)
@@ -136,7 +136,7 @@ void Palette::advanceGradient()
                 colVal = static_cast<int>(255.0 *
                         sin(M_PI * colIndex / numOfColors));
 
-                const gcn::Color &col = elem->testColor;
+                const Color &col = elem->testColor;
 
                 color.r = ((colVal * col.r) / 255) % (col.r + 1);
                 color.g = ((colVal * col.g) / 255) % (col.g + 1);
@@ -180,9 +180,9 @@ void Palette::advanceGradient()
             }
             else if (elem->grad == RAINBOW)
             {
-                const gcn::Color &startCol = RAINBOW_COLORS[colIndex];
-                const gcn::Color &destCol =
-                        RAINBOW_COLORS[(colIndex + 1) % numOfColors];
+                const Color &startCol = RAINBOW_COLORS[colIndex];
+                const Color &destCol
+                    = RAINBOW_COLORS[(colIndex + 1) % numOfColors];
                 double startColVal;
                 double destColVal;
 
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 26ea6817c..0dbb5d3ad 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -26,7 +26,7 @@
 
 #include "logger.h"
 
-#include <guichan/color.hpp>
+#include "gui/color.h"
 
 #if defined __native_client__
 #include <stdlib.h>
@@ -49,7 +49,7 @@ class Palette
 {
     public:
         /** Black Color Constant */
-        static const gcn::Color BLACK;
+        static const Color BLACK;
 
         /** Colors can be static or can alter over time. */
         enum GradientType
@@ -71,8 +71,8 @@ class Palette
          *
          * @return the requested color or Palette::BLACK
          */
-        const gcn::Color &getCharColor(const signed char c,
-                                       bool &valid) const A_WARN_UNUSED;
+        const Color &getCharColor(const signed char c,
+                                  bool &valid) const A_WARN_UNUSED;
 
         int getIdByChar(const signed char c, bool &valid) const A_WARN_UNUSED;
 
@@ -85,8 +85,8 @@ class Palette
          *
          * @return the requested color
          */
-        inline const gcn::Color &getColor(int type,
-                                          const int alpha = 255) A_WARN_UNUSED
+        inline const Color &getColor(int type,
+                                     const int alpha = 255) A_WARN_UNUSED
         {
             if (type >= static_cast<signed>(mColors.size()) || type < 0)
             {
@@ -94,15 +94,14 @@ class Palette
                     type, static_cast<unsigned int>(mColors.size()));
                 type = 0;
             }
-            gcn::Color* col = &mColors[type].color;
+            Color* col = &mColors[type].color;
             col->a = alpha;
             return *col;
         }
 
-        inline const gcn::Color &getColorWithAlpha(const int type)
-                                                   A_WARN_UNUSED
+        inline const Color &getColorWithAlpha(const int type) A_WARN_UNUSED
         {
-            gcn::Color* col = &mColors[type].color;
+            Color* col = &mColors[type].color;
             col->a = mColors[type].delay;
             return *col;
         }
@@ -144,7 +143,7 @@ class Palette
 
     protected:
         /** Colors used for the rainbow gradient */
-        static const gcn::Color RAINBOW_COLORS[7];
+        static const Color RAINBOW_COLORS[7];
         static const int RAINBOW_COLOR_COUNT;
 
         /** Time tick, that gradient-type colors were updated the last time. */
@@ -183,9 +182,9 @@ class Palette
             }
 
             int type;
-            gcn::Color color;
-            gcn::Color testColor;
-            gcn::Color committedColor;
+            Color color;
+            Color testColor;
+            Color committedColor;
             std::string text;
             signed char ch;
             GradientType grad;
@@ -194,7 +193,7 @@ class Palette
             int delay;
             int committedDelay;
 
-            void set(const int type0, const gcn::Color &color0,
+            void set(const int type0, const Color &color0,
                      const GradientType grad0, const int delay0)
             {
                 type = type0;
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index 6d3077130..07d4b064a 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -24,15 +24,14 @@
 #include "being/being.h"
 #include "being/playerrelations.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/widgets/label.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 BeingPopup::BeingPopup() :
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 1fd496dec..0a65ce3bc 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -27,7 +27,8 @@
 #include "item.h"
 #include "units.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/widgets/icon.h"
 #include "gui/widgets/label.h"
@@ -38,8 +39,6 @@
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 extern int serverVersion;
@@ -265,7 +264,7 @@ void ItemPopup::setLabelColor(Label *label, const ItemType type) const
 }
 #undef caseSetColor
 
-void ItemPopup::mouseMoved(gcn::MouseEvent &event)
+void ItemPopup::mouseMoved(MouseEvent &event)
 {
     Popup::mouseMoved(event);
 
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index ac4683938..f1cedf046 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -29,6 +29,7 @@
 #include "resources/iteminfo.h"
 
 class Icon;
+class Item;
 class Label;
 class TextBox;
 
@@ -60,7 +61,7 @@ class ItemPopup final : public Popup
 
         void setItem(const Item *const item, const bool showImage = false);
 
-        void mouseMoved(gcn::MouseEvent &mouseEvent) override final;
+        void mouseMoved(MouseEvent &mouseEvent) override final;
 
     private:
         Label *mItemName;
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 52cf1d5d6..3905d91e6 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -23,6 +23,7 @@
 #include "gui/popups/popupmenu.h"
 
 #include "actormanager.h"
+#include "commands.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "dropshortcut.h"
@@ -56,6 +57,7 @@
 
 #include "gui/viewport.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tabs/chattab.h"
 #include "gui/widgets/progressbar.h"
@@ -79,7 +81,7 @@
 #include "utils/gettext.h"
 #include "utils/process.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include "debug.h"
 
@@ -118,7 +120,7 @@ PopupMenu::PopupMenu() :
     mPlayerListener.setNick("");
     mPlayerListener.setDialog(nullptr);
     mPlayerListener.setType(static_cast<int>(Being::UNKNOWN));
-    mScrollArea = new ScrollArea(mBrowserBox, false);
+    mScrollArea = new ScrollArea(this, mBrowserBox, false);
     mScrollArea->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO);
 }
 
@@ -839,7 +841,7 @@ void PopupMenu::showChangePos(const int x, const int y)
 }
 
 void PopupMenu::handleLink(const std::string &link,
-                           gcn::MouseEvent *event A_UNUSED)
+                           MouseEvent *event A_UNUSED)
 {
     Being *being = nullptr;
     if (actorManager)
@@ -2683,7 +2685,7 @@ void PopupMenu::addPickupFilter(const std::string &name)
 }
 
 void PopupMenu::showPopup(const int x, const int y,
-                          gcn::ListModel *const model)
+                          ListModel *const model)
 {
     if (!model)
         return;
@@ -2838,7 +2840,7 @@ void PopupMenu::showGMPopup()
 }
 
 RenameListener::RenameListener() :
-    gcn::ActionListener(),
+    ActionListener(),
     mMapItemX(0),
     mMapItemY(0),
     mDialog(nullptr)
@@ -2859,7 +2861,7 @@ void RenameListener::setMapItem(MapItem *const mapItem)
     }
 }
 
-void RenameListener::action(const gcn::ActionEvent &event)
+void RenameListener::action(const ActionEvent &event)
 {
     if (event.getId() == "ok" && viewport && mDialog)
     {
@@ -2893,7 +2895,7 @@ PlayerListener::PlayerListener() :
 {
 }
 
-void PlayerListener::action(const gcn::ActionEvent &event)
+void PlayerListener::action(const ActionEvent &event)
 {
     if (event.getId() == "ok" && !mNick.empty() && mDialog)
     {
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 0970f34b6..7eb38dc15 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -26,19 +26,18 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 
-#include "being/actorsprite.h"
-
-#include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "listeners/actionlistener.h"
 
 #include "localconsts.h"
 
+class ActorSprite;
 class Being;
 class BrowserBox;
 class Button;
 class ChatTab;
 class FloorItem;
 class Item;
+class ListModel;
 class MapItem;
 class ScrollArea;
 class TextCommand;
@@ -47,14 +46,14 @@ class TextField;
 class ProgressBar;
 class Window;
 
-class RenameListener final : public gcn::ActionListener
+class RenameListener final : public ActionListener
 {
     public:
         RenameListener();
 
         A_DELETE_COPY(RenameListener)
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void setMapItem(MapItem *const mapItem);
 
@@ -67,14 +66,14 @@ class RenameListener final : public gcn::ActionListener
         TextDialog *mDialog;
 };
 
-class PlayerListener : public gcn::ActionListener
+class PlayerListener : public ActionListener
 {
     public:
         PlayerListener();
 
         A_DELETE_COPY(PlayerListener)
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void setNick(std::string name)
         { mNick = name; }
@@ -173,7 +172,7 @@ class PopupMenu final : public Popup, public LinkHandler
 
         void showChangePos(const int x, const int y);
 
-        void showPopup(const int x, const int y, gcn::ListModel *const model);
+        void showPopup(const int x, const int y, ListModel *const model);
 
         void showTextFieldPopup(int x, int y, TextField *const input);
 
@@ -187,7 +186,7 @@ class PopupMenu final : public Popup, public LinkHandler
          * Handles link action.
          */
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event A_UNUSED) override final;
+                        MouseEvent *event A_UNUSED) override final;
 
         void clear();
 
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index e32a6bb4d..3d0250a78 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -23,14 +23,12 @@
 
 #include "gui/popups/speechbubble.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/textbox.h"
-
-#include <guichan/font.hpp>
 
 #include "debug.h"
 
@@ -59,8 +57,8 @@ void SpeechBubble::postInit()
 }
 
 void SpeechBubble::setCaption(const std::string &name,
-                              const gcn::Color *const color1,
-                              const gcn::Color *const color2)
+                              const Color *const color1,
+                              const Color *const color2)
 {
     mCaption->setCaption(name);
     mCaption->adjustSize();
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index 62da9b146..1bc5385a4 100644
--- a/src/gui/popups/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
@@ -47,9 +47,9 @@ class SpeechBubble final : public Popup
          * Sets the name displayed for the speech bubble, and in what color.
          */
         void setCaption(const std::string &name,
-                        const gcn::Color *const color1 =
+                        const Color *const color1 =
                         &Theme::getThemeColor(Theme::BUBBLE_NAME),
-                        const gcn::Color *const color2 =
+                        const Color *const color2 =
                         &Theme::getThemeColor(Theme::BUBBLE_NAME_OUTLINE));
 
         /**
diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index df25739f2..bf6ea1799 100644
--- a/src/gui/popups/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -23,7 +23,9 @@
 
 #include "gui/popups/spellpopup.h"
 
-#include "gui/sdlfont.h"
+#include "textcommand.h"
+
+#include "gui/gui.h"
 
 #include "gui/widgets/label.h"
 
@@ -88,7 +90,7 @@ void SpellPopup::view(const int x, const int y)
     int posX = std::max(0, x - getWidth() / 2);
     int posY = y + distance;
 
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     const int w = rect.width;
     const int h = rect.height;
     if (posX + w > mainGraphics->mWidth)
@@ -109,7 +111,7 @@ void SpellPopup::view(const int x, const int y)
     requestMoveToTop();
 }
 
-void SpellPopup::mouseMoved(gcn::MouseEvent &event)
+void SpellPopup::mouseMoved(MouseEvent &event)
 {
     Popup::mouseMoved(event);
 
diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h
index c8123a4ce..cbbd53703 100644
--- a/src/gui/popups/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
@@ -26,9 +26,8 @@
 
 #include "gui/widgets/popup.h"
 
-#include "textcommand.h"
-
 class Label;
+class TextCommand;
 
 /**
  * A popup that displays information about an item.
@@ -60,7 +59,7 @@ class SpellPopup final : public Popup
          */
         void view(const int x, const int y);
 
-        void mouseMoved(gcn::MouseEvent &mouseEvent) override final;
+        void mouseMoved(MouseEvent &mouseEvent) override final;
 
     private:
         Label *mItemName;
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 1d696fe82..7dd3c3634 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -33,7 +33,7 @@
 
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp
index 9a7f1d3e4..d5cc918d3 100644
--- a/src/gui/popups/textpopup.cpp
+++ b/src/gui/popups/textpopup.cpp
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/label.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
@@ -86,7 +86,7 @@ void TextPopup::show(const int x, const int y, const std::string &str1,
     setHeight(pad2 + mText[0]->getFont()->getHeight() * cnt);
     const int distance = 20;
 
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     int posX = std::max(0, x - rect.width / 2);
     int posY = y + distance;
 
@@ -100,7 +100,7 @@ void TextPopup::show(const int x, const int y, const std::string &str1,
     requestMoveToTop();
 }
 
-void TextPopup::mouseMoved(gcn::MouseEvent &event)
+void TextPopup::mouseMoved(MouseEvent &event)
 {
     Popup::mouseMoved(event);
 
diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h
index 131921b7b..eb29cba61 100644
--- a/src/gui/popups/textpopup.h
+++ b/src/gui/popups/textpopup.h
@@ -72,7 +72,7 @@ class TextPopup final : public Popup
         void show(const int x, const int y, const std::string &str1,
                   const std::string &str2, const std::string &str3);
 
-        void mouseMoved(gcn::MouseEvent &mouseEvent) override final;
+        void mouseMoved(MouseEvent &mouseEvent) override final;
 
     private:
         Label *mText[TEXTPOPUPCOUNT];
diff --git a/src/guichan/mouseinput.cpp b/src/gui/rect.cpp
index b13708bb7..5f9d2bf0f 100644
--- a/src/guichan/mouseinput.cpp
+++ b/src/gui/rect.cpp
@@ -65,72 +65,92 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/mouseinput.hpp"
+#include "gui/rect.h"
 
 #include "debug.h"
 
-namespace gcn
+Rect::Rect() :
+    x(0),
+    y(0),
+    width(0),
+    height(0)
 {
-    MouseInput::MouseInput(const unsigned int button,
-                           const unsigned int type,
-                           const int x,
-                           const int y,
-                           const int timeStamp) :
-        mType(type),
-        mButton(button),
-        mTimeStamp(timeStamp),
-        mX(x),
-        mY(y)
-    {
-    }
+}
 
-    void MouseInput::setType(unsigned int type)
-    {
-        mType = type;
-    }
+Rect::Rect(const int x_, const int y_,
+           const int width_, const int height_) :
+    x(x_),
+    y(y_),
+    width(width_),
+    height(height_)
+{
+}
 
-    unsigned int MouseInput::getType() const
-    {
-        return mType;
-    }
+void Rect::setAll(const int x0,
+                  const int y0,
+                  const int width0,
+                  const int height0)
+{
+    x = x0;
+    y = y0;
+    width = width0;
+    height = height0;
+}
 
-    void MouseInput::setButton(unsigned int button)
-    {
-        mButton = button;
-    }
+bool Rect::isIntersecting(const Rect& rectangle) const
+{
+    int x_ = x;
+    int y_ = y;
+    int width_ = width;
+    int height_ = height;
 
-    unsigned int MouseInput::getButton() const
-    {
-        return mButton;
-    }
+    x_ -= rectangle.x;
+    y_ -= rectangle.y;
 
-    int MouseInput::getTimeStamp() const
+    if (x_ < 0)
     {
-        return mTimeStamp;
+        width_ += x_;
+//            x_ = 0;
     }
-
-    void MouseInput::setTimeStamp(int timeStamp)
+    else if (x_ + width_ > rectangle.width)
     {
-        mTimeStamp = timeStamp;
+        width_ = rectangle.width - x_;
     }
 
-    void MouseInput::setX(int x)
+    if (y_ < 0)
     {
-        mX = x;
+        height_ += y_;
+//            y_ = 0;
     }
-
-    int MouseInput::getX() const
+    else if (y_ + height_ > rectangle.height)
     {
-        return mX;
+        height_ = rectangle.height - y_;
     }
 
-    void MouseInput::setY(int y)
+    if (width_ <= 0 || height_ <= 0)
     {
-        mY = y;
+        return false;
     }
 
-    int MouseInput::getY() const
-    {
-        return mY;
-    }
-}  // namespace gcn
+    return true;
+}
+
+bool Rect::isPointInRect(int x_, int y_) const
+{
+    return x_ >= x
+        && y_ >= y
+        && x_ < x + width
+        && y_ < y + height;
+}
+
+std::ostream& operator<<(std::ostream& out,
+                         const Rect& rectangle)
+{
+    out << "Rect [x = " << rectangle.x
+        << ", y = " << rectangle.y
+        << ", width = " << rectangle.width
+        << ", height = " << rectangle.height
+        << "]";
+
+    return out;
+}
diff --git a/src/guichan/include/guichan/rectangle.hpp b/src/gui/rect.h
index b8503db98..69c0120ca 100644
--- a/src/guichan/include/guichan/rectangle.hpp
+++ b/src/gui/rect.h
@@ -61,99 +61,102 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_RECTANGLE_HPP
-#define GCN_RECTANGLE_HPP
+#ifndef GUI_RECT_H
+#define GUI_RECT_H
 
 #include <iostream>
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * Represents a rectangle.
+  *
+  * @since 0.1.0
+  */
+class Rect
 {
-    /**
-     * Represents a rectangle.
-     *
-     * @since 0.1.0
-     */
-    class Rectangle
-    {
     public:
         /**
-         * Constructor. The default rectangle is an empty rectangle
-         * at the coordinates (0,0).
-         */
-        Rectangle();
+          * Constructor. The default rectangle is an empty rectangle
+          * at the coordinates (0,0).
+          */
+        Rect();
 
         /**
-         * Constructor.
-         *
-         * @param x The x coordinate of the rectangle.
-         * @param y The y coordinate of the rectangle.
-         * @param width The width of the rectangle.
-         * @param height The height of the rectangle.
-         * @since 0.1.0
-         */
-        Rectangle(const int x, const int y, const int width, const int height);
+          * Constructor.
+          *
+          * @param x The x coordinate of the rectangle.
+          * @param y The y coordinate of the rectangle.
+          * @param width The width of the rectangle.
+          * @param height The height of the rectangle.
+          * @since 0.1.0
+          */
+        Rect(const int x, const int y, const int width, const int height);
+
+        virtual ~Rect()
+        { }
 
         /**
-         * Sets the dimension of a rectangle.
-         *
-         * @param x The x coordinate of the rectangle.
-         * @param y The y coordinate of the rectangle.
-         * @param width The width of the rectangle.
-         * @param height The height of the rectangle.
-         * @since 0.1.0
-         */
-        void setAll(int x, int y, int width, int height);
+          * Sets the dimension of a rectangle.
+          *
+          * @param x The x coordinate of the rectangle.
+          * @param y The y coordinate of the rectangle.
+          * @param width The width of the rectangle.
+          * @param height The height of the rectangle.
+          * @since 0.1.0
+          */
+        void setAll(const int x,
+                    const int y,
+                    const int width0,
+                    const int height0);
 
         /**
-         * Checks if another rectangle intersects with the rectangle.
-         *
-         * @param rectangle Another rectangle to check for intersection.
-         * @return True if the rectangles intersect, false otherwise.
-         * @since 0.1.0
-         */
-        bool isIntersecting(const Rectangle& rectangle) const A_WARN_UNUSED;
+          * Checks if another rectangle intersects with the rectangle.
+          *
+          * @param rectangle Another rectangle to check for intersection.
+          * @return True if the rectangles intersect, false otherwise.
+          * @since 0.1.0
+          */
+        bool isIntersecting(const Rect& rectangle) const A_WARN_UNUSED;
 
         /**
-         * Checks if a point is inside the rectangle
-         *
-         * @param x The x coordinate of the point.
-         * @param y The y coordinate of the point.
-         * @return True if the point is inside the rectangle.
-         * @since 0.1.0
-         */
+          * Checks if a point is inside the rectangle
+          *
+          * @param x The x coordinate of the point.
+          * @param y The y coordinate of the point.
+          * @return True if the point is inside the rectangle.
+          * @since 0.1.0
+          */
         bool isPointInRect(int x, int y) const A_WARN_UNUSED;
 
         /**
-         * Output operator for output.
-         *
-         * @param out The stream to output to.
-         * @param rectangle The rectangle to output.
-         */
+          * Output operator for output.
+          *
+          * @param out The stream to output to.
+          * @param rectangle The rectangle to output.
+          */
         friend std::ostream& operator<<(std::ostream& out,
-                                        const Rectangle& rectangle);
+                                        const Rect& rectangle);
 
         /**
-         * Holds the x coordinate of the rectangle.
-         */
+          * Holds the x coordinate of the rectangle.
+          */
         int x;
 
         /**
-         * Holds the x coordinate of the rectangle.
-         */
+          * Holds the x coordinate of the rectangle.
+          */
         int y;
 
         /**
-         * Holds the width of the rectangle.
-         */
+          * Holds the width of the rectangle.
+          */
         int width;
 
         /**
-         * Holds the height of the rectangle.
-         */
+          * Holds the height of the rectangle.
+          */
         int height;
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_RECTANGEL_HPP
+#endif  // GUI_RECT_H
diff --git a/src/gui/sdlfont_unittest.cc b/src/gui/sdlfont_unittest.cc
index eab4d2994..e0f536c01 100644
--- a/src/gui/sdlfont_unittest.cc
+++ b/src/gui/sdlfont_unittest.cc
@@ -20,7 +20,7 @@
 
 #include "logger.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
 #include "gui/theme.h"
 
 #include "gtest/gtest.h"
@@ -43,7 +43,7 @@ TEST(TextChunkList, add1)
     TextChunkList list;
 
     SDLTextChunk *chunk = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 3, 4));
+        Color(1, 2, 3), Color(2, 3, 4));
 
     list.insertFirst(chunk);
 
@@ -66,9 +66,9 @@ TEST(TextChunkList, add2)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(3, 4, 5));
+        Color(1, 2, 3), Color(3, 4, 5));
     SDLTextChunk *chunk2 = new SDLTextChunk("test",
-        gcn::Color(2, 3, 4), gcn::Color(4, 5, 6));
+        Color(2, 3, 4), Color(4, 5, 6));
 
     list.insertFirst(chunk2);
     list.insertFirst(chunk1);
@@ -96,7 +96,7 @@ TEST(TextChunkList, addRemoveBack1)
     TextChunkList list;
 
     SDLTextChunk *chunk = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
 
     list.insertFirst(chunk);
     list.removeBack();
@@ -113,9 +113,9 @@ TEST(TextChunkList, addRemoveBack2)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunk *chunk2 = new SDLTextChunk("test2",
-        gcn::Color(1, 2, 4), gcn::Color(1, 2, 5));
+        Color(1, 2, 4), Color(1, 2, 5));
 
     list.insertFirst(chunk2);
     list.insertFirst(chunk1);
@@ -140,9 +140,9 @@ TEST(TextChunkList, addRemoveBack3)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunk *chunk2 = new SDLTextChunk("test2",
-        gcn::Color(2, 3, 4), gcn::Color(2, 3, 4));
+        Color(2, 3, 4), Color(2, 3, 4));
 
     list.insertFirst(chunk2);
     list.insertFirst(chunk1);
@@ -161,11 +161,11 @@ TEST(TextChunkList, addRemoveBack4)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunk *chunk2 = new SDLTextChunk("test2",
-        gcn::Color(2, 3, 4), gcn::Color(2, 3, 4));
+        Color(2, 3, 4), Color(2, 3, 4));
     SDLTextChunk *chunk3 = new SDLTextChunk("test",
-        gcn::Color(3, 4, 5), gcn::Color(3, 4, 5));
+        Color(3, 4, 5), Color(3, 4, 5));
 
     list.insertFirst(chunk3);
     list.insertFirst(chunk2);
@@ -191,7 +191,7 @@ TEST(TextChunkList, moveToFirst1)
     TextChunkList list;
 
     SDLTextChunk *chunk = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 3, 4));
+        Color(1, 2, 3), Color(2, 3, 4));
 
     list.insertFirst(chunk);
     list.moveToFirst(chunk);
@@ -208,9 +208,9 @@ TEST(TextChunkList, moveToFirst2)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunk *chunk2 = new SDLTextChunk("test",
-        gcn::Color(2, 3, 4), gcn::Color(1, 2, 3));
+        Color(2, 3, 4), Color(1, 2, 3));
 
     list.insertFirst(chunk1);
     list.insertFirst(chunk2);
@@ -230,11 +230,11 @@ TEST(TextChunkList, moveToFirst3)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunk *chunk2 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 4), gcn::Color(1, 2, 3));
+        Color(1, 2, 4), Color(1, 2, 3));
     SDLTextChunk *chunk3 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 5), gcn::Color(1, 2, 3));
+        Color(1, 2, 5), Color(1, 2, 3));
 
     list.insertFirst(chunk3);
     list.insertFirst(chunk1);
@@ -257,11 +257,11 @@ TEST(TextChunkList, moveToFirst4)
     TextChunkList list;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(), gcn::Color());
+        Color(), Color());
     SDLTextChunk *chunk2 = new SDLTextChunk("test2",
-        gcn::Color(), gcn::Color());
+        Color(), Color());
     SDLTextChunk *chunk3 = new SDLTextChunk("test3",
-        gcn::Color(), gcn::Color());
+        Color(), Color());
 
     list.insertFirst(chunk1);
     list.insertFirst(chunk3);
@@ -284,7 +284,7 @@ TEST(TextChunkList, clear1)
     TextChunkList list;
     int chunksLeft = sdlTextChunkCnt;
 
-    SDLTextChunk *chunk = new SDLTextChunk("test", gcn::Color(), gcn::Color());
+    SDLTextChunk *chunk = new SDLTextChunk("test", Color(), Color());
 
     list.insertFirst(chunk);
     list.clear();
@@ -303,11 +303,11 @@ TEST(TextChunkList, clear2)
     int chunksLeft = sdlTextChunkCnt;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 0));
+        Color(1, 2, 3), Color(2, 0, 0));
     SDLTextChunk *chunk2 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 1));
+        Color(1, 2, 3), Color(2, 0, 1));
     SDLTextChunk *chunk3 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 2));
+        Color(1, 2, 3), Color(2, 0, 2));
 
     list.insertFirst(chunk1);
     list.insertFirst(chunk2);
@@ -328,11 +328,11 @@ TEST(TextChunkList, clear3)
     int chunksLeft = sdlTextChunkCnt;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 0));
+        Color(1, 2, 3), Color(2, 0, 0));
     SDLTextChunk *chunk2 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 1));
+        Color(1, 2, 3), Color(2, 0, 1));
     SDLTextChunk *chunk3 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 2));
+        Color(1, 2, 3), Color(2, 0, 2));
 
     list.insertFirst(chunk1);
     list.insertFirst(chunk2);
@@ -359,11 +359,11 @@ TEST(TextChunkList, clear4)
     int chunksLeft = sdlTextChunkCnt;
 
     SDLTextChunk *chunk1 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 0));
+        Color(1, 2, 3), Color(2, 0, 0));
     SDLTextChunk *chunk2 = new SDLTextChunk("test",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 1));
+        Color(1, 2, 3), Color(2, 0, 1));
     SDLTextChunk *chunk3 = new SDLTextChunk("test3",
-        gcn::Color(1, 2, 3), gcn::Color(2, 0, 2));
+        Color(1, 2, 3), Color(2, 0, 2));
 
     list.insertFirst(chunk1);
     list.insertFirst(chunk2);
@@ -387,11 +387,11 @@ TEST(TextChunkList, clear4)
 TEST(TextChunkList, sort1)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item3("test line2",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     EXPECT_EQ(false, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
     EXPECT_EQ(true, item1 < item3);
@@ -401,9 +401,9 @@ TEST(TextChunkList, sort1)
 TEST(TextChunkList, sort2)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(2, 3, 4), gcn::Color(1, 2, 3));
+        Color(2, 3, 4), Color(1, 2, 3));
     EXPECT_EQ(true, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
 }
@@ -411,9 +411,9 @@ TEST(TextChunkList, sort2)
 TEST(TextChunkList, sort3)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(1, 3, 4), gcn::Color(1, 2, 3));
+        Color(1, 3, 4), Color(1, 2, 3));
     EXPECT_EQ(true, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
 }
@@ -421,9 +421,9 @@ TEST(TextChunkList, sort3)
 TEST(TextChunkList, sort4)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(1, 2, 4), gcn::Color(1, 2, 3));
+        Color(1, 2, 4), Color(1, 2, 3));
     EXPECT_EQ(true, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
 }
@@ -431,9 +431,9 @@ TEST(TextChunkList, sort4)
 TEST(TextChunkList, sort5)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(2, 2, 3));
+        Color(1, 2, 3), Color(2, 2, 3));
     EXPECT_EQ(true, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
 }
@@ -441,9 +441,9 @@ TEST(TextChunkList, sort5)
 TEST(TextChunkList, sort6)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 3, 3));
+        Color(1, 2, 3), Color(1, 3, 3));
     EXPECT_EQ(true, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
 }
@@ -451,9 +451,9 @@ TEST(TextChunkList, sort6)
 TEST(TextChunkList, sort7)
 {
     SDLTextChunkSmall item1("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+        Color(1, 2, 3), Color(1, 2, 3));
     SDLTextChunkSmall item2("test line1",
-        gcn::Color(1, 2, 3), gcn::Color(1, 2, 4));
+        Color(1, 2, 3), Color(1, 2, 4));
     EXPECT_EQ(true, item1 < item2);
     EXPECT_EQ(false, item2 < item1);
 }
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 193a35dfe..ffb90a883 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -75,12 +75,12 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gui/sdlinput.h"
-
 #include "sdlshared.h"
 
 #include "input/inputmanager.h"
 
+#include "gui/sdlinput.h"
+
 #include "render/graphics.h"
 
 #ifdef USE_SDL2
@@ -90,8 +90,6 @@
 #include <SDL_keyboard.h>
 #include <SDL_timer.h>
 
-#include <guichan/exception.hpp>
-
 SDLInput::SDLInput() :
     mKeyInputQueue(),
     mMouseInputQueue(),
@@ -100,7 +98,7 @@ SDLInput::SDLInput() :
 {
 }
 
-bool SDLInput::isKeyQueueEmpty()
+bool SDLInput::isKeyQueueEmpty() const
 {
     return mKeyInputQueue.empty();
 }
@@ -108,9 +106,7 @@ bool SDLInput::isKeyQueueEmpty()
 KeyInput SDLInput::dequeueKeyInput2()
 {
     if (mKeyInputQueue.empty())
-    {
-        throw GCN_EXCEPTION("The queue is empty.");
-    }
+        return KeyInput();
 
     KeyInput keyInput = mKeyInputQueue.front();
     mKeyInputQueue.pop();
@@ -118,17 +114,17 @@ KeyInput SDLInput::dequeueKeyInput2()
     return keyInput;
 }
 
-bool SDLInput::isMouseQueueEmpty()
+bool SDLInput::isMouseQueueEmpty() const
 {
     return mMouseInputQueue.empty();
 }
 
-gcn::MouseInput SDLInput::dequeueMouseInput()
+MouseInput SDLInput::dequeueMouseInput()
 {
-    gcn::MouseInput mouseInput;
+    MouseInput mouseInput;
 
     if (mMouseInputQueue.empty())
-        throw GCN_EXCEPTION("The queue is empty.");
+        return MouseInput();
 
     mouseInput = mMouseInputQueue.front();
     mMouseInputQueue.pop();
@@ -141,7 +137,7 @@ MouseInput SDLInput::dequeueMouseInput2()
     MouseInput mouseInput;
 
     if (mMouseInputQueue.empty())
-        throw GCN_EXCEPTION("The queue is empty.");
+        return MouseInput();
 
     mouseInput = mMouseInputQueue.front();
     mMouseInputQueue.pop();
@@ -158,7 +154,7 @@ void SDLInput::pushInput(const SDL_Event &event)
     {
         case SDL_KEYDOWN:
         {
-            keyInput.setType(gcn::KeyInput::PRESSED);
+            keyInput.setType(KeyInput::PRESSED);
             convertKeyEventToKey(event, keyInput);
             mKeyInputQueue.push(keyInput);
             break;
@@ -166,7 +162,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 
         case SDL_KEYUP:
         {
-            keyInput.setType(gcn::KeyInput::RELEASED);
+            keyInput.setType(KeyInput::RELEASED);
             convertKeyEventToKey(event, keyInput);
             mKeyInputQueue.push(keyInput);
             break;
@@ -174,8 +170,8 @@ void SDLInput::pushInput(const SDL_Event &event)
 
 #ifdef USE_SDL2
         case SDL_TEXTINPUT:
-            keyInput.setType(gcn::KeyInput::PRESSED);
-            keyInput.setKey(gcn::Key(Key::TEXTINPUT));
+            keyInput.setType(KeyInput::PRESSED);
+            keyInput.setKey(Key(Key::TEXTINPUT));
             keyInput.setText(event.text.text);
             mKeyInputQueue.push(keyInput);
             break;
@@ -193,9 +189,9 @@ void SDLInput::pushInput(const SDL_Event &event)
 #endif
                 mouseInput.setButton(-1);
                 if (y > 0)
-                    mouseInput.setType(gcn::MouseInput::WHEEL_MOVED_UP);
+                    mouseInput.setType(MouseInput::WHEEL_MOVED_UP);
                 else
-                    mouseInput.setType(gcn::MouseInput::WHEEL_MOVED_DOWN);
+                    mouseInput.setType(MouseInput::WHEEL_MOVED_DOWN);
                 mouseInput.setTimeStamp(SDL_GetTicks());
                 mMouseInputQueue.push(mouseInput);
             }
@@ -231,12 +227,12 @@ void SDLInput::pushInput(const SDL_Event &event)
 
 #ifndef USE_SDL2
             if (event.button.button == SDL_BUTTON_WHEELDOWN)
-                mouseInput.setType(gcn::MouseInput::WHEEL_MOVED_DOWN);
+                mouseInput.setType(MouseInput::WHEEL_MOVED_DOWN);
             else if (event.button.button == SDL_BUTTON_WHEELUP)
-                mouseInput.setType(gcn::MouseInput::WHEEL_MOVED_UP);
+                mouseInput.setType(MouseInput::WHEEL_MOVED_UP);
             else
 #endif
-                mouseInput.setType(gcn::MouseInput::PRESSED);
+                mouseInput.setType(MouseInput::PRESSED);
             mouseInput.setTimeStamp(SDL_GetTicks());
             mMouseInputQueue.push(mouseInput);
             break;
@@ -258,7 +254,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 #endif
 #endif
             mouseInput.setButton(convertMouseButton(event.button.button));
-            mouseInput.setType(gcn::MouseInput::RELEASED);
+            mouseInput.setType(MouseInput::RELEASED);
             mouseInput.setTimeStamp(SDL_GetTicks());
             mMouseInputQueue.push(mouseInput);
             break;
@@ -278,8 +274,8 @@ void SDLInput::pushInput(const SDL_Event &event)
                 event.motion.realy / scale);
 #endif
 #endif
-            mouseInput.setButton(gcn::MouseInput::EMPTY);
-            mouseInput.setType(gcn::MouseInput::MOVED);
+            mouseInput.setButton(MouseInput::EMPTY);
+            mouseInput.setType(MouseInput::MOVED);
             mouseInput.setTimeStamp(SDL_GetTicks());
             mMouseInputQueue.push(mouseInput);
             break;
@@ -299,8 +295,8 @@ void SDLInput::pushInput(const SDL_Event &event)
                 {
                     mouseInput.setX(-1);
                     mouseInput.setY(-1);
-                    mouseInput.setButton(gcn::MouseInput::EMPTY);
-                    mouseInput.setType(gcn::MouseInput::MOVED);
+                    mouseInput.setButton(MouseInput::EMPTY);
+                    mouseInput.setType(MouseInput::MOVED);
                     mMouseInputQueue.push(mouseInput);
                 }
             }
@@ -319,7 +315,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 
 void SDLInput::convertKeyEventToKey(const SDL_Event &event, KeyInput &keyInput)
 {
-    keyInput.setKey(gcn::Key(convertKeyCharacter(event)));
+    keyInput.setKey(Key(convertKeyCharacter(event)));
     keyInput.setShiftPressed(event.key.keysym.mod & KMOD_SHIFT);
     keyInput.setControlPressed(event.key.keysym.mod & KMOD_CTRL);
     keyInput.setAltPressed(event.key.keysym.mod & KMOD_ALT);
@@ -342,11 +338,11 @@ int SDLInput::convertMouseButton(const int button)
     switch (button)
     {
       case SDL_BUTTON_LEFT:
-          return gcn::MouseInput::LEFT;
+          return MouseInput::LEFT;
       case SDL_BUTTON_RIGHT:
-          return gcn::MouseInput::RIGHT;
+          return MouseInput::RIGHT;
       case SDL_BUTTON_MIDDLE:
-          return gcn::MouseInput::MIDDLE;
+          return MouseInput::MIDDLE;
       default:
           // We have an unknown mouse type which is ignored.
           return button;
@@ -573,10 +569,10 @@ void SDLInput::simulateMouseClick(const int x, const int y,
     mouseInput.setY(y);
     mouseInput.setReal(x, y);
     mouseInput.setButton(button);
-    mouseInput.setType(gcn::MouseInput::PRESSED);
+    mouseInput.setType(MouseInput::PRESSED);
     mouseInput.setTimeStamp(SDL_GetTicks());
     mMouseInputQueue.push(mouseInput);
-    mouseInput.setType(gcn::MouseInput::RELEASED);
+    mouseInput.setType(MouseInput::RELEASED);
     mouseInput.setTimeStamp(SDL_GetTicks());
     mMouseInputQueue.push(mouseInput);
 }
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index b07a57a00..8197aa110 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -80,75 +80,16 @@
 
 #include "input/keyinput.h"
 
-#include "mouseinput.h"
-
 #include <SDL_events.h>
 
-#include <guichan/input.hpp>
-#include <guichan/keyinput.hpp>
-#include <guichan/mouseinput.hpp>
+#include "input/mouseinput.h"
 
 #include <queue>
 
-namespace Key
-{
-    enum
-    {
-        SPACE              = ' ',
-        TAB                = '\t',
-        ENTER              = '\n',
-        // Negative values, to avoid conflicts with higher character codes.
-        LEFT_ALT           = -1000,
-        RIGHT_ALT,
-        LEFT_SHIFT,
-        RIGHT_SHIFT,
-        LEFT_CONTROL,
-        RIGHT_CONTROL,
-        LEFT_META,
-        RIGHT_META,
-        LEFT_SUPER,
-        RIGHT_SUPER,
-        INSERT,
-        HOME,
-        PAGE_UP,
-        DELETE_,
-        END,
-        PAGE_DOWN,
-        ESCAPE,
-        CAPS_LOCK,
-        BACKSPACE,
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-        F13,
-        F14,
-        F15,
-        PRINT_SCREEN,
-        SCROLL_LOCK,
-        PAUSE,
-        NUM_LOCK,
-        ALT_GR,
-        LEFT,
-        RIGHT,
-        UP,
-        DOWN,
-        TEXTINPUT
-    };
-}  // namespace Key
-
 /**
- * SDL implementation of Input.
+ * SDL implementation of SDLInput.
  */
-class SDLInput final : public gcn::Input
+class SDLInput final
 {
 public:
     /**
@@ -166,26 +107,18 @@ public:
      */
     void pushInput(const SDL_Event &event);
 
-    /**
-     * Polls all input. It exists for input driver compatibility. If you
-     * only use SDL and plan sticking with SDL you can safely ignore this
-     * function as it in the SDL case does nothing.
-     */
-    void _pollInput() override final
-    { }
-
     KeyInput dequeueKeyInput2() A_WARN_UNUSED;
 
-    gcn::KeyInput dequeueKeyInput() override final A_WARN_UNUSED
-    { return gcn::KeyInput(); }
+    KeyInput dequeueKeyInput() A_WARN_UNUSED
+    { return KeyInput(); }
 
-    // Inherited from Input
+    // Inherited from SDLInput
 
-    bool isKeyQueueEmpty() override final A_WARN_UNUSED;
+    bool isKeyQueueEmpty() const A_WARN_UNUSED;
 
-    bool isMouseQueueEmpty() override final A_WARN_UNUSED;
+    bool isMouseQueueEmpty() const A_WARN_UNUSED;
 
-    gcn::MouseInput dequeueMouseInput() override final A_WARN_UNUSED;
+    MouseInput dequeueMouseInput() A_WARN_UNUSED;
 
     MouseInput dequeueMouseInput2() A_WARN_UNUSED;
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 4218aff7c..1a504f680 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -259,7 +259,7 @@ void Theme::deleteInstance()
     mInstance = nullptr;
 }
 
-gcn::Color Theme::getProgressColor(const int type, const float progress)
+Color Theme::getProgressColor(const int type, const float progress)
 {
     int color[3] = {0, 0, 0};
 
@@ -273,7 +273,7 @@ gcn::Color Theme::getProgressColor(const int type, const float progress)
             logger->log("color not found: " + toString(type));
     }
 
-    return gcn::Color(color[0], color[1], color[2]);
+    return Color(color[0], color[1], color[2]);
 }
 
 Skin *Theme::load(const std::string &filename, const std::string &filename2,
@@ -972,7 +972,7 @@ static int readColorType(const std::string &type)
     return -1;
 }
 
-static gcn::Color readColor(const std::string &description)
+static Color readColor(const std::string &description)
 {
     const int size = static_cast<const int>(description.length());
     if (size < 7 || description[0] != '#')
@@ -982,7 +982,7 @@ static gcn::Color readColor(const std::string &description)
         return Palette::BLACK;
     }
 
-    int v = 0;
+    unsigned int v = 0;
     for (int i = 1; i < 7; ++i)
     {
         signed const char c = description[i];
@@ -1010,7 +1010,7 @@ static gcn::Color readColor(const std::string &description)
         v = (v << 4) | n;
     }
 
-    return gcn::Color(v);
+    return Color(v);
 }
 
 static Palette::GradientType readColorGradient(const std::string &grad)
@@ -1084,7 +1084,7 @@ void Theme::loadColors(std::string file)
 
     int type;
     std::string temp;
-    gcn::Color color;
+    Color color;
     GradientType grad;
 
     for_each_xml_child_node(paletteNode, root)
diff --git a/src/gui/theme.h b/src/gui/theme.h
index b40be2881..86543ea64 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -25,7 +25,7 @@
 #ifndef GUI_THEME_H
 #define GUI_THEME_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "render/graphics.h"
 
@@ -450,21 +450,21 @@ class Theme final : public Palette, public ConfigListener
          *
          * @return the requested color
          */
-        inline static const gcn::Color &getThemeColor(const int type,
-                                                      const int alpha = 255)
-                                                      A_WARN_UNUSED
+        inline static const Color &getThemeColor(const int type,
+                                                 const int alpha = 255)
+                                                 A_WARN_UNUSED
         { return mInstance->getColor(type, alpha); }
 
-        static const gcn::Color &getThemeCharColor(const signed char c,
-                                                   bool &valid) A_WARN_UNUSED
+        static const Color &getThemeCharColor(const signed char c,
+                                              bool &valid) A_WARN_UNUSED
         { return mInstance->getCharColor(c, valid); }
 
         static int getThemeIdByChar(const signed char c,
                                     bool &valid) A_WARN_UNUSED
         { return mInstance->getIdByChar(c, valid); }
 
-        static gcn::Color getProgressColor(const int type,
-                                           const float progress) A_WARN_UNUSED;
+        static Color getProgressColor(const int type,
+                                      const float progress) A_WARN_UNUSED;
 
         /**
          * Loads a skin.
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 69125f8e2..74d47203f 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -237,7 +237,7 @@ UserPalette::~UserPalette()
 void UserPalette::setColor(const int type, const int r,
                            const int g, const int b)
 {
-    gcn::Color &color = mColors[type].color;
+    Color &color = mColors[type].color;
     color.r = r;
     color.g = g;
     color.b = b;
@@ -296,14 +296,14 @@ void UserPalette::rollback()
         if (i->grad != i->committedGrad)
             setGradient(i->type, i->committedGrad);
 
-        const gcn::Color &committedColor = i->committedColor;
+        const Color &committedColor = i->committedColor;
         setGradientDelay(i->type, i->committedDelay);
         setColor(i->type, committedColor.r,
                  committedColor.g, committedColor.b);
 
         if (i->grad == PULSE)
         {
-            gcn::Color &testColor = i->testColor;
+            Color &testColor = i->testColor;
             testColor.r = committedColor.r;
             testColor.g = committedColor.g;
             testColor.b = committedColor.b;
@@ -342,7 +342,7 @@ void UserPalette::addColor(const unsigned type, const unsigned rgb,
         rgbValue = atox(rgbString);
     else
         rgbValue = atoi(rgbString.c_str());
-    const gcn::Color &trueCol = gcn::Color(rgbValue);
+    const Color &trueCol = Color(rgbValue);
     grad = static_cast<GradientType>(config.getValue(configName + "Gradient",
                                      static_cast<int>(grad)));
     delay = config.getValueInt(configName + "Delay", delay);
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 18fe1cbe2..7bab5bed9 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -26,12 +26,12 @@
 
 #include "gui/palette.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 /**
  * Class controlling the game's color palette.
  */
-class UserPalette final : public Palette, public gcn::ListModel
+class UserPalette final : public Palette, public ListModel
 {
     public:
         /** List of all colors that are configurable. */
@@ -100,8 +100,8 @@ class UserPalette final : public Palette, public gcn::ListModel
          *
          * @return the requested committed color
          */
-        inline const gcn::Color &getCommittedColor(const int type)
-                                                   const A_WARN_UNUSED
+        inline const Color &getCommittedColor(const int type)
+                                              const A_WARN_UNUSED
         {
             return mColors[type].committedColor;
         }
@@ -113,8 +113,7 @@ class UserPalette final : public Palette, public gcn::ListModel
          *
          * @return the requested test color
          */
-        inline const gcn::Color &getTestColor(const int type)
-                                              const A_WARN_UNUSED
+        inline const Color &getTestColor(const int type) const A_WARN_UNUSED
         { return mColors[type].testColor; }
 
         /**
@@ -123,7 +122,7 @@ class UserPalette final : public Palette, public gcn::ListModel
          * @param type the color type requested
          * @param color the color that should be tested
          */
-        inline void setTestColor(const int type, const gcn::Color &color)
+        inline void setTestColor(const int type, const Color &color)
         { mColors[type].testColor = color; }
 
         /**
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 341af1f0b..96760f8c7 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -42,7 +42,7 @@
 
 #include "gui/windows/ministatuswindow.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
@@ -51,7 +51,7 @@ extern MiniStatusWindow *miniStatusWindow;
 
 Viewport::Viewport() :
     WindowContainer(nullptr),
-    gcn::MouseListener(),
+    MouseListener(),
     mMap(nullptr),
     mScrollRadius(config.getIntValue("ScrollRadius")),
     mScrollLaziness(config.getIntValue("ScrollLaziness")),
@@ -114,22 +114,20 @@ void Viewport::setMap(Map *const map)
     mMap = map;
 }
 
-void Viewport::draw(gcn::Graphics *gcnGraphics)
+void Viewport::draw(Graphics *graphics)
 {
     BLOCK_START("Viewport::draw 1")
     static int lastTick = tick_time;
 
     if (!mMap || !player_node)
     {
-        gcnGraphics->setColor(gcn::Color(64, 64, 64));
-        gcnGraphics->fillRectangle(
-                gcn::Rectangle(0, 0, getWidth(), getHeight()));
+        graphics->setColor(Color(64, 64, 64));
+        graphics->fillRectangle(
+                Rect(0, 0, getWidth(), getHeight()));
         BLOCK_END("Viewport::draw 1")
         return;
     }
 
-    Graphics *const graphics = static_cast<Graphics* const>(gcnGraphics);
-
     // Avoid freaking out when tick_time overflows
     if (tick_time < lastTick)
         lastTick = tick_time;
@@ -260,7 +258,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
         miniStatusWindow->drawIcons(graphics);
 
     // Draw contained widgets
-    WindowContainer::draw(gcnGraphics);
+    WindowContainer::draw(graphics);
     BLOCK_END("Viewport::draw 1")
 }
 
@@ -282,13 +280,13 @@ void Viewport::_followMouse()
     if (mPlayerFollowMouse && (button & SDL_BUTTON(1)))
     {
         // We create a mouse event and send it to mouseDragged.
-        gcn::MouseEvent mouseEvent(nullptr,
+        MouseEvent mouseEvent(nullptr,
             0,
             false,
             false,
             false,
-            gcn::MouseEvent::DRAGGED,
-            gcn::MouseEvent::LEFT,
+            MouseEvent::DRAGGED,
+            MouseEvent::LEFT,
             mMouseX,
             mMouseY,
             0);
@@ -340,54 +338,29 @@ void Viewport::_drawDebugPath(Graphics *const graphics)
 }
 
 void Viewport::_drawPath(Graphics *const graphics, const Path &path,
-                         const gcn::Color &color) const
+                         const Color &color) const
 {
     graphics->setColor(color);
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
+    int cnt = 1;
+    FOR_EACH (Path::const_iterator, i, path)
     {
-        int cnt = 1;
-        FOR_EACH (Path::const_iterator, i, path)
-        {
-            const int squareX = i->x * mapTileSize - mPixelViewX + 12;
-            const int squareY = i->y * mapTileSize - mPixelViewY + 12;
+        const int squareX = i->x * mapTileSize - mPixelViewX + 12;
+        const int squareY = i->y * mapTileSize - mPixelViewY + 12;
 
-            graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
-            if (mMap)
-            {
-                const std::string str = toString(cnt);
-                font->drawString(graphics, str, squareX + 4
-                    - font->getWidth(str) / 2, squareY + 12);
-            }
-            cnt ++;
-        }
-    }
-#ifdef MANASERV_SUPPORT
-    else if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        FOR_EACH (Path::const_iterator, i, path)
+        graphics->fillRectangle(Rect(squareX, squareY, 8, 8));
+        if (mMap)
         {
-            const int squareX = i->x - mPixelViewX;
-            const int squareY = i->y - mPixelViewY;
-
-            graphics->fillRectangle(gcn::Rectangle(squareX - 4, squareY - 4,
-                                                   8, 8));
-            if (mMap)
-            {
-                const std::string str = toString(mMap->getMetaTile(
-                    i->x / mapTileSize, i->y / mapTileSize)->Gcost);
-                font->drawString(graphics, str,
-                    squareX + 4 - font->getWidth(text) / 2, squareY + 12);
-            }
+            const std::string str = toString(cnt);
+            font->drawString(graphics, str, squareX + 4
+                - font->getWidth(str) / 2, squareY + 12);
         }
+        cnt ++;
     }
-#endif
 }
 
-void Viewport::mousePressed(gcn::MouseEvent &event)
+void Viewport::mousePressed(MouseEvent &event)
 {
     if (event.getSource() != this)
         return;
@@ -408,7 +381,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     const int pixelY = eventY + mPixelViewY;
 
     // Right click might open a popup
-    if (eventButton == gcn::MouseEvent::RIGHT)
+    if (eventButton == MouseEvent::RIGHT)
     {
         mPlayerFollowMouse = false;
         if (mHoverBeing)
@@ -462,7 +435,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     }
 
     // Left click can cause different actions
-    if (eventButton == gcn::MouseEvent::LEFT)
+    if (eventButton == MouseEvent::LEFT)
     {
         // Interact with some being
         if (mHoverBeing)
@@ -534,7 +507,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
             _followMouse();
         }
     }
-    else if (eventButton == gcn::MouseEvent::MIDDLE)
+    else if (eventButton == MouseEvent::MIDDLE)
     {
         mPlayerFollowMouse = false;
         validateSpeed();
@@ -550,7 +523,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void Viewport::mouseDragged(gcn::MouseEvent &event)
+void Viewport::mouseDragged(MouseEvent &event)
 {
     if (!mMap || !player_node)
         return;
@@ -559,127 +532,111 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
         Input::KEY_STOP_ATTACK) && !inputManager.isActionActive(
         Input::KEY_UNTARGET))
     {
-#ifdef MANASERV_SUPPORT
-        if (Net::getNetworkType() == ServerInfo::MANASERV)
+        if (mLocalWalkTime != player_node->getActionTime())
         {
-            if (get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
+            mLocalWalkTime = cur_time;
+            player_node->unSetPickUpTarget();
+            int playerX = player_node->getTileX();
+            int playerY = player_node->getTileY();
+            if (mMouseDirectionMove)
             {
-                mLocalWalkTime = tick_time;
-                player_node->unSetPickUpTarget();
-                player_node->setDestination(event.getX() + mPixelViewX,
-                    event.getY() + mPixelViewY);
-                player_node->pathSetByMouse();
-            }
-        }
-        else
-#endif
-        {
-            if (mLocalWalkTime != player_node->getActionTime())
-            {
-                mLocalWalkTime = cur_time;
-                player_node->unSetPickUpTarget();
-                int playerX = player_node->getTileX();
-                int playerY = player_node->getTileY();
-                if (mMouseDirectionMove)
+                const int width = mainGraphics->mWidth / 2;
+                const int height = mainGraphics->mHeight / 2;
+                const float wh = static_cast<float>(width)
+                    / static_cast<float>(height);
+                int x = event.getX() - width;
+                int y = event.getY() - height;
+                if (!x && !y)
+                    return;
+                const int x2 = abs(x);
+                const int y2 = abs(y);
+                const float diff = 2;
+                int dx = 0;
+                int dy = 0;
+                if (x2 > y2)
                 {
-                    const int width = mainGraphics->mWidth / 2;
-                    const int height = mainGraphics->mHeight / 2;
-                    const float wh = static_cast<float>(width)
-                        / static_cast<float>(height);
-                    int x = event.getX() - width;
-                    int y = event.getY() - height;
-                    if (!x && !y)
-                        return;
-                    const int x2 = abs(x);
-                    const int y2 = abs(y);
-                    const float diff = 2;
-                    int dx = 0;
-                    int dy = 0;
-                    if (x2 > y2)
-                    {
-                        if (y2 && x2 / y2 / wh > diff)
-                            y = 0;
-                    }
-                    else
-                    {
-                        if (x2 && y2 * wh / x2 > diff)
-                            x = 0;
-                    }
-                    if (x > 0)
-                        dx = 1;
-                    else if (x < 0)
-                        dx = -1;
-                    if (y > 0)
-                        dy = 1;
-                    else if (y < 0)
-                        dy = -1;
-
-                    if (mMap->getWalk(playerX + dx, playerY + dy))
+                    if (y2 && x2 / y2 / wh > diff)
+                        y = 0;
+                }
+                else
+                {
+                    if (x2 && y2 * wh / x2 > diff)
+                        x = 0;
+                }
+                if (x > 0)
+                    dx = 1;
+                else if (x < 0)
+                    dx = -1;
+                if (y > 0)
+                    dy = 1;
+                else if (y < 0)
+                    dy = -1;
+
+                if (mMap->getWalk(playerX + dx, playerY + dy))
+                {
+                    player_node->navigateTo(playerX + dx, playerY + dy);
+                }
+                else
+                {
+                    if (dx && dy)
                     {
-                        player_node->navigateTo(playerX + dx, playerY + dy);
+                        // try avoid diagonal collision
+                        if (x2 > y2)
+                        {
+                            if (mMap->getWalk(playerX + dx, playerY))
+                                dy = 0;
+                            else
+                                dx = 0;
+                        }
+                        else
+                        {
+                            if (mMap->getWalk(playerX, playerY + dy))
+                                dx = 0;
+                            else
+                                dy = 0;
+                        }
                     }
                     else
                     {
-                        if (dx && dy)
+                        // try avoid vertical or horisontal collision
+                        if (!dx)
                         {
-                            // try avoid diagonal collision
-                            if (x2 > y2)
-                            {
-                                if (mMap->getWalk(playerX + dx, playerY))
-                                    dy = 0;
-                                else
-                                    dx = 0;
-                            }
-                            else
-                            {
-                                if (mMap->getWalk(playerX, playerY + dy))
-                                    dx = 0;
-                                else
-                                    dy = 0;
-                            }
+                            if (mMap->getWalk(playerX + 1, playerY + dy))
+                                dx = 1;
+                            if (mMap->getWalk(playerX - 1, playerY + dy))
+                                dx = -1;
                         }
-                        else
+                        if (!dy)
                         {
-                            // try avoid vertical or horisontal collision
-                            if (!dx)
-                            {
-                                if (mMap->getWalk(playerX + 1, playerY + dy))
-                                    dx = 1;
-                                if (mMap->getWalk(playerX - 1, playerY + dy))
-                                    dx = -1;
-                            }
-                            if (!dy)
-                            {
-                                if (mMap->getWalk(playerX + dx, playerY + 1))
-                                    dy = 1;
-                                if (mMap->getWalk(playerX + dx, playerY - 1))
-                                    dy = -1;
-                            }
+                            if (mMap->getWalk(playerX + dx, playerY + 1))
+                                dy = 1;
+                            if (mMap->getWalk(playerX + dx, playerY - 1))
+                                dy = -1;
                         }
-                        player_node->navigateTo(playerX + dx, playerY + dy);
                     }
+                    player_node->navigateTo(playerX + dx, playerY + dy);
                 }
-                else
+            }
+            else
+            {
+                const int destX = (event.getX() + mPixelViewX)
+                    / static_cast<float>(mMap->getTileWidth());
+                const int destY = (event.getY() + mPixelViewY)
+                    / static_cast<float>(mMap->getTileHeight());
+                if (playerX != destX || playerY != destY)
                 {
-                    const int destX = (event.getX() + mPixelViewX)
-                        / static_cast<float>(mMap->getTileWidth());
-                    const int destY = (event.getY() + mPixelViewY)
-                        / static_cast<float>(mMap->getTileHeight());
-                    if (playerX != destX || playerY != destY)
+                    if (!player_node->navigateTo(destX, destY))
                     {
-                        if (!player_node->navigateTo(destX, destY))
-                        {
-                            if (playerX > destX)
-                                playerX --;
-                            else if (playerX < destX)
-                                playerX ++;
-                            if (playerY > destY)
-                                playerY --;
-                            else if (playerY < destY)
-                                playerY ++;
-                            if (mMap->getWalk(playerX, playerY, 0))
-                                player_node->navigateTo(playerX, playerY);
-                        }
+                        if (playerX > destX)
+                            playerX --;
+                        else if (playerX < destX)
+                            playerX ++;
+                        if (playerY > destY)
+                            playerY --;
+                        else if (playerY < destY)
+                            playerY ++;
+                        if (mMap->getWalk(playerX, playerY, 0))
+                            player_node->navigateTo(playerX, playerY);
                     }
                 }
             }
@@ -687,10 +644,9 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void Viewport::mouseReleased(gcn::MouseEvent &event A_UNUSED)
+void Viewport::mouseReleased(MouseEvent &event A_UNUSED)
 {
     mPlayerFollowMouse = false;
-    // Only useful for eAthena but doesn't hurt under ManaServ
     mLocalWalkTime = -1;
 }
 
@@ -840,7 +796,7 @@ void Viewport::optionChanged(const std::string &name)
         mMouseDirectionMove = config.getBoolValue("mouseDirectionMove");
 }
 
-void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
+void Viewport::mouseMoved(MouseEvent &event A_UNUSED)
 {
     // Check if we are on the map
     if (!mMap || !player_node || !actorManager)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index dcddc003c..16d0e4e34 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -23,12 +23,13 @@
 #ifndef GUI_VIEWPORT_H
 #define GUI_VIEWPORT_H
 
-#include "configlistener.h"
 #include "position.h"
 
+#include "listeners/configlistener.h"
+
 #include "gui/widgets/windowcontainer.h"
 
-#include <guichan/mouselistener.hpp>
+#include "listeners/mouselistener.h"
 
 class ActorSprite;
 class Button;
@@ -59,7 +60,7 @@ const int walkingMouseDelay = 500;
  * coordinates.
  */
 class Viewport final : public WindowContainer,
-                       public gcn::MouseListener,
+                       public MouseListener,
                        public ConfigListener
 {
     public:
@@ -83,7 +84,7 @@ class Viewport final : public WindowContainer,
         /**
          * Draws the viewport.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Implements player to keep following mouse.
@@ -102,22 +103,22 @@ class Viewport final : public WindowContainer,
         /**
          * Handles mouse press on map.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
         /**
          * Handles mouse move on map
          */
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         /**
          * Handles mouse button release on map.
          */
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
         /**
          * Handles mouse move on map.
          */
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
         /**
          * Shows a popup for an item.
@@ -297,7 +298,7 @@ class Viewport final : public WindowContainer,
          * Draws the given path.
          */
         void _drawPath(Graphics *const graphics, const Path &path,
-                       const gcn::Color &color = gcn::Color(255, 0, 0)) const;
+                       const Color &color = Color(255, 0, 0)) const;
 
         /**
          * Make the player go to the mouse position.
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index b676a7e94..01126f8ac 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -28,16 +28,16 @@
 
 #include "being/localplayer.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 #include "gui/viewport.h"
 
+#include "gui/models/avatarlistmodel.h"
+
 #include "gui/windows/chatwindow.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 int AvatarListBox::instances = 0;
@@ -90,7 +90,7 @@ AvatarListBox::~AvatarListBox()
     }
 }
 
-void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
+void AvatarListBox::draw(Graphics *graphics)
 {
     BLOCK_START("AvatarListBox::draw")
     if (!mListModel || !player_node)
@@ -102,12 +102,10 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
     AvatarListModel *const model = static_cast<AvatarListModel *const>(
         mListModel);
     updateAlpha();
-    Graphics *const graphics = static_cast<Graphics *const>(gcnGraphics);
-
-    gcn::Font *const font = getFont();
 
+    Font *const font = getFont();
     const int fontHeight = getFont()->getHeight();
-    const gcn::Widget *const parent = mParent;
+    const Widget *const parent = mParent;
     const std::string name = player_node->getName();
 
     // Draw the list elements
@@ -137,7 +135,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
                 }
                 else
                 {
-                    graphics->drawImage2(icon, mImagePadding, y + mPadding);
+                    graphics->drawImage(icon, mImagePadding, y + mPadding);
                 }
             }
         }
@@ -158,13 +156,13 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
             }
             if (parent && a->getMaxHp())
             {
-                gcn::Color color = Theme::getProgressColor(
+                Color color = Theme::getProgressColor(
                         Theme::PROG_HP, static_cast<float>(a->getHp())
                         / static_cast<float>(a->getMaxHp()));
                 color.a = 80;
                 graphics->setColor(color);
 
-                graphics->fillRectangle(gcn::Rectangle(mPadding, y + mPadding,
+                graphics->fillRectangle(Rect(mPadding, y + mPadding,
                     parent->getWidth() * a->getHp() / a->getMaxHp()
                     - 2 * mPadding, fontHeight));
             }
@@ -184,12 +182,11 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
 
             if (parent)
             {
-                gcn::Color color = Theme::getProgressColor(Theme::PROG_HP,
-                        1);
+                Color color = Theme::getProgressColor(Theme::PROG_HP, 1);
 
                 color.a = 80;
                 graphics->setColor(color);
-                graphics->fillRectangle(gcn::Rectangle(mPadding, y + mPadding,
+                graphics->fillRectangle(Rect(mPadding, y + mPadding,
                     parent->getWidth() * a->getDamageHp() / 1024
                     - 2 * mPadding, fontHeight));
 
@@ -312,7 +309,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
     BLOCK_END("AvatarListBox::draw")
 }
 
-void AvatarListBox::mousePressed(gcn::MouseEvent &event)
+void AvatarListBox::mousePressed(MouseEvent &event)
 {
     if (!actorManager || !player_node || !viewport
         || !getFont()->getHeight())
@@ -336,7 +333,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
         return;
 
     const unsigned int eventButton = event.getButton();
-    if (eventButton == gcn::MouseEvent::LEFT)
+    if (eventButton == MouseEvent::LEFT)
     {
         if (ava->getType() == AVATAR_PLAYER)
         {
@@ -350,7 +347,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
             player_node->navigateTo(ava->getX(), ava->getY());
         }
     }
-    else if (eventButton == gcn::MouseEvent::RIGHT)
+    else if (eventButton == MouseEvent::RIGHT)
     {
         switch (ava->getType())
         {
@@ -409,7 +406,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
             }
         }
     }
-    else if (eventButton == gcn::MouseEvent::MIDDLE)
+    else if (eventButton == MouseEvent::MIDDLE)
     {
         if (ava->getType() == AVATAR_PLAYER && chatWindow)
         {
@@ -421,7 +418,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void AvatarListBox::mouseReleased(gcn::MouseEvent &event A_UNUSED)
+void AvatarListBox::mouseReleased(MouseEvent &event A_UNUSED)
 {
 }
 
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 99c1132b2..e0711a7b7 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -22,29 +22,21 @@
 #ifndef GUI_WIDGETS_AVATARLISTBOX_H
 #define GUI_WIDGETS_AVATARLISTBOX_H
 
-#include "avatar.h"
-
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "gui/widgets/listbox.h"
 
 #include <string>
 
+class AvatarListModel;
 class Image;
 
-class AvatarListModel : public gcn::ListModel
-{
-public:
-    virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
-
-    std::string getElementAt(int i) override final A_WARN_UNUSED
-    { return getAvatarAt(i)->getName(); }
-};
-
-class AvatarListBox final : public ListBox, public ConfigListener
+class AvatarListBox final : public ListBox,
+                            public ConfigListener
 {
 public:
-    AvatarListBox(const Widget2 *const widget, AvatarListModel *const model);
+    AvatarListBox(const Widget2 *const widget,
+                  AvatarListModel *const model);
 
     A_DELETE_COPY(AvatarListBox)
 
@@ -53,11 +45,11 @@ public:
     /**
      * Draws the list box.
      */
-    void draw(gcn::Graphics *gcnGraphics) override final;
+    void draw(Graphics *gcnGraphics) override final;
 
-    void mousePressed(gcn::MouseEvent &event) override final;
+    void mousePressed(MouseEvent &event) override final;
 
-    void mouseReleased(gcn::MouseEvent &event A_UNUSED) override final;
+    void mouseReleased(MouseEvent &event A_UNUSED) override final;
 
     void optionChanged(const std::string &value) override final;
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index b91c095b7..100281d94 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -25,8 +25,8 @@
 
 #include "input/inputmanager.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 
 #include "gui/widgets/linkhandler.h"
 
@@ -37,9 +37,9 @@
 #include "utils/stringutils.h"
 #include "utils/timer.h"
 
-#include <guichan/graphics.hpp>
-#include <guichan/font.hpp>
-#include <guichan/cliprectangle.hpp>
+#include "gui/cliprect.h"
+
+#include "render/graphics.h"
 
 #include <algorithm>
 
@@ -52,9 +52,8 @@ BrowserBox::BrowserBox(const Widget2 *const widget,
                        const unsigned int mode,
                        const bool opaque,
                        const std::string &skin) :
-    gcn::Widget(),
-    Widget2(widget),
-    gcn::MouseListener(),
+    Widget(widget),
+    MouseListener(),
     mTextRows(),
     mTextRowLinksCount(),
     mLineParts(),
@@ -174,7 +173,7 @@ void BrowserBox::addRow(const std::string &row, const bool atTop)
     std::string tmp = row;
     std::string newRow;
     size_t idx1;
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     int linksCount = 0;
 
     if (getWidth() < 0)
@@ -422,7 +421,7 @@ struct MouseOverLink
     int mX, mY;
 };
 
-void BrowserBox::mousePressed(gcn::MouseEvent &event)
+void BrowserBox::mousePressed(MouseEvent &event)
 {
     if (!mLinkHandler)
         return;
@@ -437,7 +436,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void BrowserBox::mouseMoved(gcn::MouseEvent &event)
+void BrowserBox::mouseMoved(MouseEvent &event)
 {
     const LinkIterator i = std::find_if(mLinks.begin(), mLinks.end(),
         MouseOverLink(event.getX(), event.getY()));
@@ -446,13 +445,14 @@ void BrowserBox::mouseMoved(gcn::MouseEvent &event)
         ? static_cast<int>(i - mLinks.begin()) : -1;
 }
 
-void BrowserBox::draw(gcn::Graphics *graphics)
+void BrowserBox::draw(Graphics *graphics)
 {
     BLOCK_START("BrowserBox::draw")
-    const gcn::ClipRectangle &cr = graphics->getCurrentClipArea();
-    Graphics *const graphics2 = static_cast<Graphics *const>(graphics);
-    mYStart = cr.y - cr.yOffset;
-    const int yEnd = mYStart + cr.height;
+    const ClipRect *const cr = graphics->getCurrentClipArea();
+    if (!cr)
+        return;
+    mYStart = cr->y - cr->yOffset;
+    const int yEnd = mYStart + cr->height;
     if (mYStart < 0)
         mYStart = 0;
 
@@ -462,7 +462,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
     if (mOpaque)
     {
         graphics->setColor(mBackgroundColor);
-        graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
+        graphics->fillRectangle(Rect(0, 0, getWidth(), getHeight()));
     }
 
     if (mSelectedLink >= 0 && mSelectedLink
@@ -471,7 +471,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
         if ((mHighMode & BACKGROUND))
         {
             graphics->setColor(mHighlightColor);
-            graphics->fillRectangle(gcn::Rectangle(
+            graphics->fillRectangle(Rect(
                 mLinks[mSelectedLink].x1,
                 mLinks[mSelectedLink].y1,
                 mLinks[mSelectedLink].x2 - mLinks[mSelectedLink].x1,
@@ -489,7 +489,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
         }
     }
 
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     FOR_EACH (LinePartCIter, i, mLineParts)
     {
@@ -500,7 +500,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
             break;
         if (!part.mType)
         {
-            graphics2->setColorAll(part.mColor, part.mColor2);
+            graphics->setColorAll(part.mColor, part.mColor2);
             if (part.mBold)
                 boldFont->drawString(graphics, part.mText, part.mX, part.mY);
             else
@@ -508,7 +508,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
         }
         else if (part.mImage)
         {
-            graphics2->drawImage2(part.mImage, part.mX, part.mY);
+            graphics->drawImage(part.mImage, part.mX, part.mY);
         }
     }
 
@@ -528,14 +528,14 @@ int BrowserBox::calcHeight()
     if (maxWidth < 0)
         return 1;
 
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     const int fontHeight = font->getHeight() + 2 * mItemPadding;
     const int fontWidthMinus = font->getWidth("-");
     const char *const hyphen = "~";
     const int hyphenWidth = font->getWidth(hyphen);
 
-    gcn::Color selColor[2] = {mForegroundColor, mForegroundColor2};
-    const gcn::Color textColor[2] = {mForegroundColor, mForegroundColor2};
+    Color selColor[2] = {mForegroundColor, mForegroundColor2};
+    const Color textColor[2] = {mForegroundColor, mForegroundColor2};
     ResourceManager *const resman = ResourceManager::getInstance();
 
     mLineParts.clear();
@@ -581,7 +581,7 @@ int BrowserBox::calcHeight()
             continue;
         }
 
-        gcn::Color prevColor[2];
+        Color prevColor[2];
         prevColor[0] = selColor[0];
         prevColor[1] = selColor[1];
         bold = false;
@@ -621,7 +621,7 @@ int BrowserBox::calcHeight()
                     const signed char c = row.at(start + 2);
 
                     bool valid(false);
-                    const gcn::Color col[2] =
+                    const Color col[2] =
                     {
                         getThemeCharColor(c, valid),
                         getThemeCharColor(c | 0x80, valid)
@@ -897,8 +897,8 @@ std::string BrowserBox::getTextAtPos(const int x, const int y) const
     return str;
 }
 
-void BrowserBox::setForegroundColorAll(const gcn::Color &color1,
-                                       const gcn::Color &color2)
+void BrowserBox::setForegroundColorAll(const Color &color1,
+                                       const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 09f06bc39..8202fa548 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -24,10 +24,9 @@
 #ifndef GUI_WIDGETS_BROWSERBOX_H
 #define GUI_WIDGETS_BROWSERBOX_H
 
-#include "gui/widgets/widget2.h"
+#include "listeners/mouselistener.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
+#include "gui/widgets/widget.h"
 
 #include <list>
 #include <vector>
@@ -60,8 +59,8 @@ struct BrowserLink final
 class LinePart final
 {
     public:
-        LinePart(const int x, const int y, const gcn::Color &color,
-                 const gcn::Color &color2, const std::string &text,
+        LinePart(const int x, const int y, const Color &color,
+                 const Color &color2, const std::string &text,
                  const bool bold) :
             mX(x),
             mY(y),
@@ -74,8 +73,8 @@ class LinePart final
         {
         }
 
-        LinePart(const int x, const int y, const gcn::Color &color,
-                 const gcn::Color &color2, Image *const image) :
+        LinePart(const int x, const int y, const Color &color,
+                 const Color &color2, Image *const image) :
             mX(x),
             mY(y),
             mColor(color),
@@ -90,8 +89,8 @@ class LinePart final
         ~LinePart();
 
         int mX, mY;
-        gcn::Color mColor;
-        gcn::Color mColor2;
+        Color mColor;
+        Color mColor2;
         std::string mText;
         unsigned char mType;
         Image *mImage;
@@ -102,9 +101,8 @@ class LinePart final
  * A simple browser box able to handle links and forward events to the
  * parent conteiner.
  */
-class BrowserBox final : public gcn::Widget,
-                         public Widget2,
-                         public gcn::MouseListener
+class BrowserBox final : public Widget,
+                         public MouseListener
 {
     public:
         /**
@@ -158,14 +156,14 @@ class BrowserBox final : public gcn::Widget,
         /**
          * Handles mouse actions.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
         /**
          * Draws the browser box.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         void updateHeight();
 
@@ -231,8 +229,8 @@ class BrowserBox final : public gcn::Widget,
         int getPadding() const A_WARN_UNUSED
         { return mPadding; }
 
-        void setForegroundColorAll(const gcn::Color &color1,
-                                   const gcn::Color &color2);
+        void setForegroundColorAll(const Color &color1,
+                                   const Color &color2);
 
         int getDataWidth() const
         { return mDataWidth; }
@@ -269,9 +267,9 @@ class BrowserBox final : public gcn::Widget,
         int mItemPadding;
         unsigned int mDataWidth;
 
-        gcn::Color mHighlightColor;
-        gcn::Color mHyperLinkColor;
-        gcn::Color mColors[2][COLORS_MAX];
+        Color mHighlightColor;
+        Color mHyperLinkColor;
+        Color mColors[2][COLORS_MAX];
 
         bool mOpaque;
         bool mUseLinksAndUserColors;
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 87d31e900..2acc5f5d3 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -22,7 +22,7 @@
 
 #include "client.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
 #include "gui/theme.h"
 
 #include "gui/widgets/browserbox.h"
@@ -51,7 +51,7 @@ TEST(browserbox, test1)
     logger = new Logger();
     imageHelper = new SDLImageHelper();
     Theme *theme = Theme::instance();
-    gcn::Widget::setGlobalFont(new SDLFont("/usr/share/fonts/truetype/"
+    Widget::setGlobalFont(new Font("/usr/share/fonts/truetype/"
         "ttf-dejavu/DejaVuSans-Oblique.ttf", 18));
     BrowserBox *box = new BrowserBox(nullptr, BrowserBox::AUTO_WRAP, true, "");
     box->setWidth(100);
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 0042b07e3..3cb6d823d 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -25,12 +25,17 @@
 #include "client.h"
 #include "graphicsvertexes.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
+#include "resources/image.h"
 #include "resources/imageset.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
+#include "gui/gui.h"
+
+#include "gui/rect.h"
 
 #include "debug.h"
 
@@ -48,9 +53,8 @@ static std::string const data[Button::BUTTON_COUNT] =
 Skin *Button::button[BUTTON_COUNT];
 
 Button::Button(const Widget2 *const widget) :
-    gcn::Button(),
-    Widget2(widget),
-    gcn::WidgetListener(),
+    gcn::Button(widget),
+    WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
     mEnabledColor(getThemeColor(Theme::BUTTON)),
@@ -81,10 +85,9 @@ Button::Button(const Widget2 *const widget) :
 Button::Button(const Widget2 *const widget,
                const std::string &restrict caption,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener) :
-    gcn::Button(caption),
-    Widget2(widget),
-    gcn::WidgetListener(),
+               ActionListener *const listener) :
+    gcn::Button(widget, caption),
+    WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
     mEnabledColor(getThemeColor(Theme::BUTTON)),
@@ -121,10 +124,9 @@ Button::Button(const Widget2 *const widget,
                const std::string &restrict imageName,
                const int imageWidth, const int imageHeight,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener) :
-    gcn::Button(caption),
-    Widget2(widget),
-    gcn::WidgetListener(),
+               ActionListener *const listener) :
+    gcn::Button(widget, caption),
+    WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
     mEnabledColor(getThemeColor(Theme::BUTTON)),
@@ -161,10 +163,9 @@ Button::Button(const Widget2 *const widget,
                const std::string &restrict imageName,
                const int imageWidth, const int imageHeight,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener) :
-    gcn::Button(),
-    Widget2(widget),
-    gcn::WidgetListener(),
+               ActionListener *const listener) :
+    gcn::Button(widget),
+    WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
     mEnabledColor(getThemeColor(Theme::BUTTON)),
@@ -201,10 +202,9 @@ Button::Button(const Widget2 *const widget,
                const std::string &restrict caption,
                const std::string &restrict imageName,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener) :
-    gcn::Button(caption),
-    Widget2(widget),
-    gcn::WidgetListener(),
+               ActionListener *const listener) :
+    gcn::Button(widget, caption),
+    WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
     mEnabledColor(getThemeColor(Theme::BUTTON)),
@@ -350,7 +350,7 @@ void Button::updateAlpha()
     }
 }
 
-void Button::draw(gcn::Graphics *graphics)
+void Button::draw(Graphics *graphics)
 {
     BLOCK_START("Button::draw")
     int mode;
@@ -373,8 +373,6 @@ void Button::draw(gcn::Graphics *graphics)
 
     updateAlpha();
 
-    Graphics *const g2 = static_cast<Graphics *const>(graphics);
-
     bool recalc = false;
     if (mRedraw)
     {
@@ -384,7 +382,7 @@ void Button::draw(gcn::Graphics *graphics)
     {
         // because we don't know where parent windows was moved,
         // need recalc vertexes
-        gcn::ClipRectangle &rect = g2->getTopClip();
+        ClipRect &rect = graphics->getTopClip();
         if (rect.xOffset != mXOffset || rect.yOffset != mYOffset)
         {
             recalc = true;
@@ -396,7 +394,7 @@ void Button::draw(gcn::Graphics *graphics)
             recalc = true;
             mMode = mode;
         }
-        else if (g2->getRedraw())
+        else if (graphics->getRedraw())
         {
             recalc = true;
         }
@@ -408,26 +406,26 @@ void Button::draw(gcn::Graphics *graphics)
     switch (mode)
     {
         case BUTTON_DISABLED:
-            g2->setColorAll(mDisabledColor, mDisabledColor2);
+            graphics->setColorAll(mDisabledColor, mDisabledColor2);
             break;
         case BUTTON_PRESSED:
-            g2->setColorAll(mPressedColor, mPressedColor2);
+            graphics->setColorAll(mPressedColor, mPressedColor2);
             break;
         case BUTTON_HIGHLIGHTED:
-            g2->setColorAll(mHighlightedColor, mHighlightedColor2);
+            graphics->setColorAll(mHighlightedColor, mHighlightedColor2);
             break;
         default:
-            g2->setColorAll(mEnabledColor, mEnabledColor2);
+            graphics->setColorAll(mEnabledColor, mEnabledColor2);
             break;
     }
 
     int imageX = 0;
     int imageY = 0;
     int textX = 0;
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     const int width = rect.width;
     const int height = rect.height;
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     int textY = height / 2 - font->getHeight() / 2;
     if (mImages)
         imageY = height / 2 - mImageHeight / 2;
@@ -437,7 +435,7 @@ void Button::draw(gcn::Graphics *graphics)
     switch (mAlignment)
     {
         default:
-        case gcn::Graphics::LEFT:
+        case Graphics::LEFT:
         {
             if (mImages)
             {
@@ -450,7 +448,7 @@ void Button::draw(gcn::Graphics *graphics)
             }
             break;
         }
-        case gcn::Graphics::CENTER:
+        case Graphics::CENTER:
         {
             const int width1 = font->getWidth(mCaption);
             if (mImages)
@@ -465,7 +463,7 @@ void Button::draw(gcn::Graphics *graphics)
             }
             break;
         }
-        case gcn::Graphics::RIGHT:
+        case Graphics::RIGHT:
         {
             const int width1 = font->getWidth(mCaption);
             textX = width - width1 - padding;
@@ -481,39 +479,39 @@ void Button::draw(gcn::Graphics *graphics)
             mRedraw = false;
             mMode = mode;
             mVertexes2->clear();
-            g2->calcWindow(mVertexes2, 0, 0, width, height,
+            graphics->calcWindow(mVertexes2,
+                0, 0,
+                width, height,
                 skin->getBorder());
 
             if (mImages)
             {
                 if (isPressed())
                 {
-                    g2->calcTileCollection(mVertexes2, mImages[mode],
+                    graphics->calcTileCollection(mVertexes2,
+                        mImages[mode],
                         imageX + 1, imageY + 1);
                 }
                 else
                 {
-                    g2->calcTileCollection(mVertexes2,
-                        mImages[mode], imageX, imageY);
+                    graphics->calcTileCollection(mVertexes2,
+                        mImages[mode],
+                        imageX, imageY);
                 }
             }
         }
-        g2->drawTileCollection(mVertexes2);
+        graphics->drawTileCollection(mVertexes2);
     }
     else
     {
-        g2->drawImageRect(0, 0, width, height, skin->getBorder());
+        graphics->drawImageRect(0, 0, width, height, skin->getBorder());
 
         if (mImages)
         {
             if (isPressed())
-            {
-                g2->drawImage2(mImages[mode], imageX + 1, imageY + 1);
-            }
+                graphics->drawImage(mImages[mode], imageX + 1, imageY + 1);
             else
-            {
-                g2->drawImage2(mImages[mode], imageX, imageY);
-            }
+                graphics->drawImage(mImages[mode], imageX, imageY);
         }
     }
 
@@ -522,13 +520,13 @@ void Button::draw(gcn::Graphics *graphics)
         textX ++;
         textY ++;
     }
-    font->drawString(g2, mCaption, textX, textY);
+    font->drawString(graphics, mCaption, textX, textY);
     BLOCK_END("Button::draw")
 }
 
-void Button::mouseReleased(gcn::MouseEvent& mouseEvent)
+void Button::mouseReleased(MouseEvent& mouseEvent)
 {
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
     {
         if (mStick)
             mPressed = !mPressed;
@@ -548,19 +546,19 @@ void Button::mouseReleased(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void Button::widgetResized(const gcn::Event &event A_UNUSED)
+void Button::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Button::widgetMoved(const gcn::Event &event A_UNUSED)
+void Button::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
 void Button::adjustSize()
 {
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     const Skin *const skin = button[BUTTON_STANDARD];
     if (!skin)
         return;
@@ -591,9 +589,9 @@ void Button::setCaption(const std::string& caption)
     mCaption = caption;
 }
 
-void Button::keyPressed(gcn::KeyEvent& keyEvent)
+void Button::keyPressed(KeyEvent& keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
 
     if (action == Input::KEY_GUI_SELECT)
     {
@@ -602,9 +600,9 @@ void Button::keyPressed(gcn::KeyEvent& keyEvent)
     }
 }
 
-void Button::keyReleased(gcn::KeyEvent& keyEvent)
+void Button::keyReleased(KeyEvent& keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
 
     if (action == Input::KEY_GUI_SELECT && mKeyPressed)
     {
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 3dd783e52..039475150 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -23,10 +23,8 @@
 #ifndef GUI_WIDGETS_BUTTON_H
 #define GUI_WIDGETS_BUTTON_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/button.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgets/button.hpp"
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -43,8 +41,7 @@ const std::string BUTTON_PLAY = "buttonplay.png";
  * \ingroup GUI
  */
 class Button final : public gcn::Button,
-                     public Widget2,
-                     public gcn::WidgetListener
+                     public WidgetListener
 {
     public:
         /**
@@ -59,7 +56,7 @@ class Button final : public gcn::Button,
         Button(const Widget2 *const widget,
                const std::string &restrict caption,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener);
+               ActionListener *const listener);
 
         /**
          * Constructor, sets the caption of the button to the given string and
@@ -70,7 +67,7 @@ class Button final : public gcn::Button,
                const std::string &restrict imageName,
                const int imageWidth, const int imageHeight,
                const std::string &actionEventId,
-               gcn::ActionListener *const listener);
+               ActionListener *const listener);
 
         /**
          * Constructor, sets the caption of the button to the given string and
@@ -80,7 +77,7 @@ class Button final : public gcn::Button,
                const std::string &restrict imageName,
                const int imageWidth, const int imageHeight,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener);
+               ActionListener *const listener);
 
         /**
          * Constructor, sets the caption of the button to the given string and
@@ -90,7 +87,7 @@ class Button final : public gcn::Button,
                const std::string &restrict imageName,
                const std::string &restrict caption,
                const std::string &restrict actionEventId,
-               gcn::ActionListener *const listener);
+               ActionListener *const listener);
 
         A_DELETE_COPY(Button)
 
@@ -102,14 +99,14 @@ class Button final : public gcn::Button,
         /**
          * Draws the button.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Update the alpha value to the button components.
          */
         static void updateAlpha();
 
-        void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
+        void mouseReleased(MouseEvent& mouseEvent) override final;
 
         void setDescription(std::string text)
         { mDescription = text; }
@@ -132,9 +129,9 @@ class Button final : public gcn::Button,
         void setPressed(bool b)
         { mPressed = b; }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         void loadImage(const std::string &imageName);
 
@@ -144,9 +141,9 @@ class Button final : public gcn::Button,
 
         void setCaption(const std::string& caption);
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
-        void keyReleased(gcn::KeyEvent &keyEvent) override final;
+        void keyReleased(KeyEvent &keyEvent) override final;
 
         bool isPressed2() const A_WARN_UNUSED;
 
@@ -168,14 +165,14 @@ class Button final : public gcn::Button,
 
         std::string mDescription;
         ImageCollection *mVertexes2;
-        gcn::Color mEnabledColor;
-        gcn::Color mEnabledColor2;
-        gcn::Color mDisabledColor;
-        gcn::Color mDisabledColor2;
-        gcn::Color mHighlightedColor;
-        gcn::Color mHighlightedColor2;
-        gcn::Color mPressedColor;
-        gcn::Color mPressedColor2;
+        Color mEnabledColor;
+        Color mEnabledColor2;
+        Color mDisabledColor;
+        Color mDisabledColor2;
+        Color mHighlightedColor;
+        Color mHighlightedColor2;
+        Color mPressedColor;
+        Color mPressedColor2;
         Image **mImages;
         ImageSet *mImageSet;
         unsigned mClickCount;
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 5ae4e2f5b..7bfc938de 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -24,6 +24,8 @@
 
 #include "units.h"
 
+#include "gui/gui.h"
+
 #include "gui/windows/charselectdialog.h"
 
 #include "gui/popups/textpopup.h"
@@ -32,16 +34,15 @@
 #include "gui/widgets/layouthelper.h"
 
 #include "utils/gettext.h"
-
-#include <SDL_mouse.h>
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
 CharacterDisplay::CharacterDisplay(const Widget2 *const widget,
                                    CharSelectDialog *const charSelectDialog) :
     Container(widget),
-    gcn::MouseListener(),
-    gcn::WidgetListener(),
+    MouseListener(),
+    WidgetListener(),
     mCharacter(nullptr),
     mPlayerBox(new PlayerBox(nullptr)),
     mName(new Label(this, "wwwwwwwwwwwwwwwwwwwwwwww")),
@@ -110,17 +111,17 @@ void CharacterDisplay::update()
     distributeResizedEvent();
 }
 
-void CharacterDisplay::widgetHidden(const gcn::Event &event A_UNUSED)
+void CharacterDisplay::widgetHidden(const Event &event A_UNUSED)
 {
     mPopup->setVisible(false);
 }
 
-void CharacterDisplay::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void CharacterDisplay::mouseExited(MouseEvent &event A_UNUSED)
 {
     mPopup->setVisible(false);
 }
 
-void CharacterDisplay::mouseMoved(gcn::MouseEvent &event A_UNUSED)
+void CharacterDisplay::mouseMoved(MouseEvent &event A_UNUSED)
 {
     if (!gui)
         return;
@@ -142,7 +143,7 @@ void CharacterDisplay::mouseMoved(gcn::MouseEvent &event A_UNUSED)
     }
 }
 
-void CharacterDisplay::mousePressed(gcn::MouseEvent &event)
+void CharacterDisplay::mousePressed(MouseEvent &event)
 {
     if (event.getClickCount() == 2)
         distributeActionEvent();
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index eb5ec6dfc..8f9acf462 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -26,10 +26,7 @@
 #include "gui/widgets/container.h"
 #include "gui/widgets/playerbox.h"
 
-#include "net/charserverhandler.h"
-#include "net/net.h"
-
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -37,9 +34,14 @@ class CharSelectDialog;
 class Label;
 class TextPopup;
 
+namespace Net
+{
+    struct Character;
+}
+
 class CharacterDisplay final : public Container,
-                               public gcn::MouseListener,
-                               public gcn::WidgetListener
+                               public MouseListener,
+                               public WidgetListener
 {
     public:
         CharacterDisplay(const Widget2 *const widget,
@@ -73,13 +75,13 @@ class CharacterDisplay final : public Container,
         void setSelect(bool b)
         { mPlayerBox->setSelected(b); }
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
     private:
         void update();
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index a7c9d2240..16b6c3e0d 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -25,12 +25,12 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include "localconsts.h"
 
 class CharacterViewBase : public Container,
-                          public gcn::ActionListener
+                          public ActionListener
 {
     public:
         A_DELETE_COPY(CharacterViewBase)
@@ -50,7 +50,7 @@ class CharacterViewBase : public Container,
     protected:
         CharacterViewBase(CharSelectDialog *const widget, const int padding) :
             Container(widget),
-            gcn::ActionListener(),
+            ActionListener(),
             mParent(widget),
             mPadding(padding),
             mSelected(0)
diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index 78c538b8c..1df98d85e 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -23,7 +23,6 @@
 #include "configuration.h"
 
 #include "gui/widgets/characterdisplay.h"
-#include "gui/widgets/characterviewsmall.h"
 
 #include "debug.h"
 
@@ -87,6 +86,6 @@ void CharacterViewNormal::resize()
         (*mCharacterEntries)[f]->setPosition((f - 5) * width, y);
 }
 
-void CharacterViewNormal::action(const gcn::ActionEvent &event A_UNUSED)
+void CharacterViewNormal::action(const ActionEvent &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index 50001a61d..4ef1500b0 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -40,7 +40,7 @@ class CharacterViewNormal final : public CharacterViewBase
 
         void resize() override;
 
-        void action(const gcn::ActionEvent &event A_UNUSED) override final;
+        void action(const ActionEvent &event A_UNUSED) override final;
 
     private:
         std::vector<CharacterDisplay*> *mCharacterEntries;
diff --git a/src/gui/widgets/characterviewsmall.cpp b/src/gui/widgets/characterviewsmall.cpp
index ce218646b..4d2c93b48 100644
--- a/src/gui/widgets/characterviewsmall.cpp
+++ b/src/gui/widgets/characterviewsmall.cpp
@@ -24,6 +24,8 @@
 #include "gui/widgets/characterdisplay.h"
 #include "gui/widgets/label.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 CharacterViewSmall::CharacterViewSmall(CharSelectDialog *const widget,
@@ -98,7 +100,7 @@ void CharacterViewSmall::resize()
     mNumber->setPosition(10, y2);
 }
 
-void CharacterViewSmall::action(const gcn::ActionEvent &event)
+void CharacterViewSmall::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "next")
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index 3a326134b..a9f6d7f9b 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -25,6 +25,8 @@
 
 #include "localconsts.h"
 
+class Label;
+
 class CharacterViewSmall final : public CharacterViewBase
 {
     public:
@@ -39,7 +41,7 @@ class CharacterViewSmall final : public CharacterViewBase
 
         void resize() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
     private:
         CharacterDisplay *mSelectedEntry;
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 47d9f2b57..9fb63b2e8 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -24,12 +24,14 @@
 
 #include "client.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "debug.h"
 
@@ -38,11 +40,11 @@ Skin *CheckBox::mSkin = nullptr;
 float CheckBox::mAlpha = 1.0;
 
 CheckBox::CheckBox(const Widget2 *const widget,
-                   const std::string &restrict caption, const bool selected,
-                   gcn::ActionListener *const listener,
+                   const std::string &restrict caption,
+                   const bool selected,
+                   ActionListener *const listener,
                    const std::string &restrict eventId) :
-    gcn::CheckBox(caption, selected),
-    Widget2(widget),
+    gcn::CheckBox(widget, caption, selected),
     mPadding(0),
     mImagePadding(0),
     mImageSize(9),
@@ -94,15 +96,13 @@ CheckBox::~CheckBox()
     }
 }
 
-void CheckBox::draw(gcn::Graphics *const graphics)
+void CheckBox::draw(Graphics *const graphics)
 {
     BLOCK_START("CheckBox::draw")
     drawBox(graphics);
 
-    gcn::Font *const font = getFont();
-    static_cast<Graphics *const>(graphics)->setColorAll(
-        mForegroundColor, mForegroundColor2);
-
+    Font *const font = getFont();
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     font->drawString(graphics, mCaption, mPadding + mImageSize + mSpacing,
         mPadding);
     BLOCK_END("CheckBox::draw")
@@ -129,7 +129,7 @@ void CheckBox::updateAlpha()
     }
 }
 
-void CheckBox::drawBox(gcn::Graphics *const graphics)
+void CheckBox::drawBox(Graphics *const graphics)
 {
     if (!mSkin || !mDrawBox)
         return;
@@ -167,24 +167,25 @@ void CheckBox::drawBox(gcn::Graphics *const graphics)
 
     if (box)
     {
-        static_cast<Graphics*>(graphics)->drawImage2(
-            box, mImagePadding, (getHeight() - mImageSize) / 2);
+        graphics->drawImage(box,
+            mImagePadding,
+            (getHeight() - mImageSize) / 2);
     }
 }
 
-void CheckBox::mouseEntered(gcn::MouseEvent& event A_UNUSED)
+void CheckBox::mouseEntered(MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void CheckBox::mouseExited(gcn::MouseEvent& event A_UNUSED)
+void CheckBox::mouseExited(MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
 
-void CheckBox::keyPressed(gcn::KeyEvent& keyEvent)
+void CheckBox::keyPressed(KeyEvent& keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
 
     if (action == Input::KEY_GUI_SELECT)
     {
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 2d4581327..28eadb75c 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -23,9 +23,7 @@
 #ifndef GUI_WIDGETS_CHECKBOX_H
 #define GUI_WIDGETS_CHECKBOX_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/checkbox.hpp>
+#include "gui/base/widgets/checkbox.hpp"
 
 #include "localconsts.h"
 
@@ -36,8 +34,7 @@ class Skin;
  *
  * \ingroup GUI
  */
-class CheckBox final : public gcn::CheckBox,
-                       public Widget2
+class CheckBox final : public gcn::CheckBox
 {
     public:
         /**
@@ -46,7 +43,7 @@ class CheckBox final : public gcn::CheckBox,
         CheckBox(const Widget2 *const widget,
                  const std::string &restrict caption,
                  const bool selected = false,
-                 gcn::ActionListener *const listener = nullptr,
+                 ActionListener *const listener = nullptr,
                  const std::string &restrict eventId = "");
 
         A_DELETE_COPY(CheckBox)
@@ -59,7 +56,7 @@ class CheckBox final : public gcn::CheckBox,
         /**
          * Draws the caption, then calls drawBox to draw the check box.
          */
-        void draw(gcn::Graphics *const graphics) override final;
+        void draw(Graphics *const graphics) override final;
 
         /**
          * Update the alpha value to the checkbox components.
@@ -69,19 +66,19 @@ class CheckBox final : public gcn::CheckBox,
         /**
          * Draws the check box, not the caption.
          */
-        void drawBox(gcn::Graphics *const graphics);
+        void drawBox(Graphics *const graphics);
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(gcn::MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) override final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(gcn::MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) override final;
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
         void adjustSize();
 
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 11dd1f07e..501b3dea7 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -20,20 +20,20 @@
 
 #include "gui/widgets/colorpage.h"
 
-#include "gui/widgets/colormodel.h"
+#include "gui/models/colormodel.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
 ColorPage::ColorPage(const Widget2 *const widget,
-                     gcn::ListModel *const listModel,
+                     ListModel *const listModel,
                      const std::string &skin) :
     ListBox(widget, listModel, skin)
 {
     mItemPadding = mSkin ? mSkin->getOption("itemPadding") : 1;
     mRowHeight = 13;
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     if (font)
         mRowHeight = font->getHeight() + 2 * mItemPadding;
     if (mListModel)
@@ -47,43 +47,42 @@ ColorPage::~ColorPage()
 {
 }
 
-void ColorPage::draw(gcn::Graphics *graphics)
+void ColorPage::draw(Graphics *graphics)
 {
     BLOCK_START("ColorPage::draw")
 
     const ColorModel *const model = static_cast<ColorModel* const>(
         mListModel);
-    Graphics *const g = static_cast<Graphics *const>(graphics);
 
     mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
     graphics->setColor(mHighlightColor);
     updateAlpha();
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     const int rowHeight = getRowHeight();
     const int width = mDimension.width;
 
     if (mSelected >= 0)
     {
-        graphics->fillRectangle(gcn::Rectangle(mPadding,
+        graphics->fillRectangle(Rect(mPadding,
             rowHeight * mSelected + mPadding,
             mDimension.width - 2 * mPadding, rowHeight));
 
         const ColorPair *const colors = model->getColorAt(mSelected);
-        g->setColorAll(*colors->color1, *colors->color2);
+        graphics->setColorAll(*colors->color1, *colors->color2);
         const std::string str = mListModel->getElementAt(mSelected);
         font->drawString(graphics, str, (width - font->getWidth(str)) / 2,
             mSelected * rowHeight + mPadding);
     }
 
-    g->setColorAll(mForegroundColor, mForegroundColor2);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     const int sz = mListModel->getNumberOfElements();
     for (int i = 0, y = mPadding; i < sz; ++i, y += rowHeight)
     {
         if (i != mSelected)
         {
             const ColorPair *const colors = model->getColorAt(i);
-            g->setColorAll(*colors->color1, *colors->color2);
+            graphics->setColorAll(*colors->color1, *colors->color2);
             const std::string str = mListModel->getElementAt(i);
             font->drawString(graphics, str, (width - font->getWidth(str)) / 2,
                 y);
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h
index c1c90eddf..88182e4f2 100644
--- a/src/gui/widgets/colorpage.h
+++ b/src/gui/widgets/colorpage.h
@@ -29,14 +29,14 @@ class ColorPage final : public ListBox
 {
     public:
         ColorPage(const Widget2 *const widget,
-                  gcn::ListModel *const listModel,
+                  ListModel *const listModel,
                   const std::string &skin);
 
         A_DELETE_COPY(ColorPage)
 
         ~ColorPage();
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         void resetAction();
 
diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp
index e37bd5103..93d74dc8d 100644
--- a/src/gui/widgets/container.cpp
+++ b/src/gui/widgets/container.cpp
@@ -22,11 +22,12 @@
 
 #include "gui/widgets/container.h"
 
+#include "gui/gui.h"
+
 #include "debug.h"
 
 Container::Container(const Widget2 *const widget) :
-    gcn::Container(),
-    Widget2(widget)
+    gcn::Container(widget)
 {
     setOpaque(false);
 }
@@ -44,7 +45,7 @@ void Container::removeControls()
         delete mWidgets.front();
 }
 
-bool Container::safeRemove(gcn::Widget *const widget)
+bool Container::safeRemove(Widget *const widget)
 {
     for (WidgetListConstIterator iter = mWidgets.begin();
          iter != mWidgets.end(); ++iter)
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 2983a7433..17d6b2af4 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -23,13 +23,7 @@
 #ifndef GUI_WIDGETS_CONTAINER_H
 #define GUI_WIDGETS_CONTAINER_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/container.hpp>
-
-#if !defined USE_INTERNALGUICHAN
-typedef std::list<gcn::Widget *>::const_iterator WidgetListConstIterator;
-#endif
+#include "gui/base/widgets/container.hpp"
 
 /**
  * A widget container.
@@ -40,15 +34,14 @@ typedef std::list<gcn::Widget *>::const_iterator WidgetListConstIterator;
  *
  * This container is also non-opaque by default.
  */
-class Container : public gcn::Container,
-                  public Widget2
+class Container : public gcn::Container
 {
     public:
         explicit Container(const Widget2 *const widget);
 
         virtual ~Container();
 
-        bool safeRemove(gcn::Widget *const widget);
+        bool safeRemove(Widget *const widget);
 
         void removeControls();
 };
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 32c8a4988..a77516c62 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -35,7 +35,7 @@
 
 Desktop::Desktop(const Widget2 *const widget) :
     Container(widget),
-    gcn::WidgetListener(),
+    WidgetListener(),
     mWallpaper(nullptr),
     mVersionLabel(nullptr),
     mSkin(nullptr),
@@ -98,17 +98,16 @@ void Desktop::reloadWallpaper()
     setBestFittingWallpaper();
 }
 
-void Desktop::widgetResized(const gcn::Event &event A_UNUSED)
+void Desktop::widgetResized(const Event &event A_UNUSED)
 {
     setBestFittingWallpaper();
 }
 
-void Desktop::draw(gcn::Graphics *graphics)
+void Desktop::draw(Graphics *graphics)
 {
     BLOCK_START("Desktop::draw")
-    Graphics *const g = static_cast<Graphics *const>(graphics);
 
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     const int width = rect.width;
     const int height = rect.height;
     if (mWallpaper)
@@ -118,30 +117,30 @@ void Desktop::draw(gcn::Graphics *graphics)
 
         if (width > wallpWidth || height > wallpHeight)
         {
-            g->setColor(mBackgroundGrayColor);
-            g->fillRectangle(gcn::Rectangle(0, 0, width, height));
+            graphics->setColor(mBackgroundGrayColor);
+            graphics->fillRectangle(Rect(0, 0, width, height));
         }
 
         if (imageHelper->useOpenGL() == RENDER_SOFTWARE)
         {
-            g->drawImage2(mWallpaper,
+            graphics->drawImage(mWallpaper,
                 (width - wallpWidth) / 2,
                 (height - wallpHeight) / 2);
         }
         else
         {
-            g->drawRescaledImage(mWallpaper, 0, 0, width, height);
+            graphics->drawRescaledImage(mWallpaper, 0, 0, width, height);
         }
     }
     else
     {
-        g->setColor(mBackgroundGrayColor);
-        g->fillRectangle(gcn::Rectangle(0, 0, width, height));
+        graphics->setColor(mBackgroundGrayColor);
+        graphics->fillRectangle(Rect(0, 0, width, height));
     }
 
     // Draw a thin border under the application version...
-    g->setColor(mBackgroundColor);
-    g->fillRectangle(gcn::Rectangle(mVersionLabel->getDimension()));
+    graphics->setColor(mBackgroundColor);
+    graphics->fillRectangle(Rect(mVersionLabel->getDimension()));
 
     Container::draw(graphics);
     BLOCK_END("Desktop::draw")
@@ -166,7 +165,7 @@ void Desktop::setBestFittingWallpaper()
             mWallpaper = nullptr;
         }
 
-        const gcn::Rectangle &rect = mDimension;
+        const Rect &rect = mDimension;
         const int width = rect.width;
         const int height = rect.height;
 
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index b62ae96ef..f0fd500ea 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -45,7 +45,8 @@ class Skin;
  *
  * \ingroup GUI
  */
-class Desktop final : public Container, private gcn::WidgetListener
+class Desktop final : public Container,
+                      private WidgetListener
 {
     public:
         explicit Desktop(const Widget2 *const widget);
@@ -59,9 +60,9 @@ class Desktop final : public Container, private gcn::WidgetListener
          */
         void reloadWallpaper();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         void postInit();
 
@@ -71,8 +72,8 @@ class Desktop final : public Container, private gcn::WidgetListener
         Image *mWallpaper;
         Label *mVersionLabel;
         Skin *mSkin;
-        gcn::Color mBackgroundColor;
-        gcn::Color mBackgroundGrayColor;
+        Color mBackgroundColor;
+        Color mBackgroundGrayColor;
         bool mShowBackground;
 };
 
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 59cdec6fb..dfc17e17b 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,15 +24,18 @@
 
 #include "client.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
+
 #include "gui/widgets/popuplist.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include <algorithm>
 
@@ -51,18 +54,17 @@ static std::string const dropdownFiles[2] =
 };
 
 DropDown::DropDown(const Widget2 *const widget,
-                   gcn::ListModel *const listModel,
+                   ListModel *const listModel,
                    const bool extended,
                    const bool modal,
-                   gcn::ActionListener *const listener,
+                   ActionListener *const listener,
                    const std::string &eventId):
-    gcn::ActionListener(),
-    gcn::BasicContainer(),
-    gcn::KeyListener(),
-    gcn::MouseListener(),
-    gcn::FocusListener(),
-    gcn::SelectionListener(),
-    Widget2(widget),
+    ActionListener(),
+    gcn::BasicContainer(widget),
+    KeyListener(),
+    MouseListener(),
+    FocusListener(),
+    SelectionListener(),
     mPopup(new PopupList(this, listModel, extended, modal)),
     mShadowColor(getThemeColor(Theme::DROPDOWN_SHADOW)),
     mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
@@ -214,7 +216,7 @@ void DropDown::updateAlpha()
     }
 }
 
-void DropDown::draw(gcn::Graphics* graphics)
+void DropDown::draw(Graphics* graphics)
 {
     BLOCK_START("DropDown::draw")
     int h;
@@ -231,12 +233,11 @@ void DropDown::draw(gcn::Graphics* graphics)
     mHighlightColor.a = alpha;
     mShadowColor.a = alpha;
 
-    gcn::ListModel *const model = mPopup->getListModel();
+    ListModel *const model = mPopup->getListModel();
     if (model && mPopup->getSelected() >= 0)
     {
-        gcn::Font *const font = getFont();
-        static_cast<Graphics *const>(graphics)->setColorAll(
-            mForegroundColor, mForegroundColor2);
+        Font *const font = getFont();
+        graphics->setColorAll(mForegroundColor, mForegroundColor2);
         if (mExtended)
         {
             const int sel = mPopup->getSelected();
@@ -250,9 +251,9 @@ void DropDown::draw(gcn::Graphics* graphics)
             }
             else
             {
-                static_cast<Graphics*>(graphics)->drawImage2(
-                    image, mImagePadding, (mDimension.height
-                    - image->getHeight()) / 2 + mPadding);
+                graphics->drawImage(image,
+                    mImagePadding,
+                    (mDimension.height - image->getHeight()) / 2 + mPadding);
                 font->drawString(graphics, model->getElementAt(sel),
                     image->getWidth() + mImagePadding + mSpacing, mPadding);
             }
@@ -267,7 +268,7 @@ void DropDown::draw(gcn::Graphics* graphics)
     if (isFocused())
     {
         graphics->setColor(mHighlightColor);
-        graphics->drawRectangle(gcn::Rectangle(mPadding, mPadding,
+        graphics->drawRectangle(Rect(mPadding, mPadding,
             mDimension.width - h - pad, h - pad));
     }
 
@@ -286,35 +287,36 @@ void DropDown::draw(gcn::Graphics* graphics)
     BLOCK_END("DropDown::draw")
 }
 
-void DropDown::drawFrame(gcn::Graphics *graphics)
+void DropDown::drawFrame(Graphics *graphics)
 {
     BLOCK_START("DropDown::drawFrame")
     const int bs2 = getFrameSize();
-    const gcn::Rectangle &rect = mDimension;
-    static_cast<Graphics*>(graphics)->drawImageRect(
-        0, 0, rect.width + bs2, rect.height + bs2, skinRect);
+    const Rect &rect = mDimension;
+    graphics->drawImageRect(0, 0,
+        rect.width + bs2, rect.height + bs2,
+        skinRect);
     BLOCK_END("DropDown::drawFrame")
 }
 
-void DropDown::drawButton(gcn::Graphics *graphics)
+void DropDown::drawButton(Graphics *graphics)
 {
     const int height = mDroppedDown ? mFoldedUpHeight : mDimension.height;
 
     Image *image = buttons[mDroppedDown][mPushed];
     if (image)
     {
-        static_cast<Graphics*>(graphics)->drawImage2(image,
+        graphics->drawImage(image,
             mDimension.width - image->getWidth() - mImagePadding,
             (height - image->getHeight()) / 2);
     }
 }
 
-void DropDown::keyPressed(gcn::KeyEvent& keyEvent)
+void DropDown::keyPressed(KeyEvent& keyEvent)
 {
     if (keyEvent.isConsumed())
         return;
 
-    const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     switch (actionId)
     {
         case Input::KEY_GUI_SELECT:
@@ -356,10 +358,10 @@ void DropDown::hideDrop(bool event)
     mPopup->setVisible(false);
 }
 
-void DropDown::mousePressed(gcn::MouseEvent& mouseEvent)
+void DropDown::mousePressed(MouseEvent& mouseEvent)
 {
     // If we have a mouse press on the widget.
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT
+    if (mouseEvent.getButton() == MouseEvent::LEFT
         && !mDroppedDown && mouseEvent.getSource() == this)
     {
         mPushed = true;
@@ -373,7 +375,7 @@ void DropDown::mousePressed(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void DropDown::mouseReleased(gcn::MouseEvent &mouseEvent)
+void DropDown::mouseReleased(MouseEvent &mouseEvent)
 {
     if (mIsDragged)
         mPushed = false;
@@ -384,12 +386,12 @@ void DropDown::mouseReleased(gcn::MouseEvent &mouseEvent)
     // Released outside of widget. Can happen when we have modal
     // input focus.
     if ((0 > y || y >= mDimension.height || x < 0 || x >= mDimension.width)
-        && button == gcn::MouseEvent::LEFT)
+        && button == MouseEvent::LEFT)
     {
         if (mIsDragged)
             foldUp();
     }
-    else if (button == gcn::MouseEvent::LEFT)
+    else if (button == MouseEvent::LEFT)
     {
         mPushed = false;
     }
@@ -397,19 +399,19 @@ void DropDown::mouseReleased(gcn::MouseEvent &mouseEvent)
     mIsDragged = false;
 }
 
-void DropDown::mouseDragged(gcn::MouseEvent &mouseEvent)
+void DropDown::mouseDragged(MouseEvent &mouseEvent)
 {
     mIsDragged = true;
     mouseEvent.consume();
 }
 
-void DropDown::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
+void DropDown::mouseWheelMovedUp(MouseEvent& mouseEvent)
 {
     setSelected(getSelected() - 1);
     mouseEvent.consume();
 }
 
-void DropDown::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
+void DropDown::mouseWheelMovedDown(MouseEvent& mouseEvent)
 {
     setSelected(getSelected() + 1);
     mouseEvent.consume();
@@ -417,7 +419,7 @@ void DropDown::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
 
 void DropDown::setSelectedString(const std::string &str)
 {
-    gcn::ListModel *const listModel = mPopup->getListModel();
+    ListModel *const listModel = mPopup->getListModel();
     if (!listModel)
         return;
 
@@ -433,7 +435,7 @@ void DropDown::setSelectedString(const std::string &str)
 
 std::string DropDown::getSelectedString() const
 {
-    gcn::ListModel *const listModel = mPopup->getListModel();
+    ListModel *const listModel = mPopup->getListModel();
     if (!listModel)
         return "";
 
@@ -490,7 +492,7 @@ void DropDown::setSelected(int selected)
         mPopup->setSelected(selected);
 }
 
-void DropDown::setListModel(gcn::ListModel *const listModel)
+void DropDown::setListModel(ListModel *const listModel)
 {
     mPopup->setListModel(listModel);
 
@@ -500,30 +502,30 @@ void DropDown::setListModel(gcn::ListModel *const listModel)
     adjustHeight();
 }
 
-gcn::ListModel *DropDown::getListModel()
+ListModel *DropDown::getListModel()
 {
     return mPopup->getListModel();
 }
 
-void DropDown::action(const gcn::ActionEvent &actionEvent A_UNUSED)
+void DropDown::action(const ActionEvent &actionEvent A_UNUSED)
 {
     foldUp();
     distributeActionEvent();
 }
 
-gcn::Rectangle DropDown::getChildrenArea()
+Rect DropDown::getChildrenArea()
 {
     if (mDroppedDown)
     {
         // Calculate the children area (with the one pixel border in mind)
-        return gcn::Rectangle(1, mFoldedUpHeight + 1,
+        return Rect(1, mFoldedUpHeight + 1,
             mDimension.width - 2, mDimension.height - mFoldedUpHeight - 2);
     }
 
-    return gcn::Rectangle();
+    return Rect();
 }
 
-void DropDown::valueChanged(const gcn::SelectionEvent& event A_UNUSED)
+void DropDown::valueChanged(const SelectionEvent& event A_UNUSED)
 {
 }
 
@@ -551,7 +553,7 @@ void DropDown::distributeValueChangedEvent()
           iter != mSelectionListeners.end();
           ++iter)
     {
-        gcn::SelectionEvent event(this);
+        SelectionEvent event(this);
         (*iter)->valueChanged(event);
     }
 }
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index ed93dc358..8e463a2c1 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -23,23 +23,19 @@
 #ifndef GUI_WIDGETS_DROPDOWN_H
 #define GUI_WIDGETS_DROPDOWN_H
 
-#include "gui/widgets/widget2.h"
+#include "gui/base/basiccontainer.hpp"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/basiccontainer.hpp>
-#include <guichan/focuslistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/focuslistener.h"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+#include "listeners/selectionlistener.h"
 
 #include "localconsts.h"
 
 class Image;
-class ImageRect;
-class ListBox;
+class ListModel;
 class PopupList;
-class ScrollArea;
 class Skin;
 
 /**
@@ -49,13 +45,12 @@ class Skin;
  * DropDown you must give DropDown an implemented ListModel which represents
  * your list.
  */
-class DropDown final : public gcn::ActionListener,
+class DropDown final : public ActionListener,
                        public gcn::BasicContainer,
-                       public gcn::KeyListener,
-                       public gcn::MouseListener,
-                       public gcn::FocusListener,
-                       public gcn::SelectionListener,
-                       public Widget2
+                       public KeyListener,
+                       public MouseListener,
+                       public FocusListener,
+                       public SelectionListener
 {
     public:
         /**
@@ -67,10 +62,10 @@ class DropDown final : public gcn::ActionListener,
          * @see ListModel, ScrollArea, ListBox.
          */
         DropDown(const Widget2 *const widget,
-                 gcn::ListModel *const listModel,
+                 ListModel *const listModel,
                  const bool extended = false,
                  const bool modal = false,
-                 gcn::ActionListener *const listener = nullptr,
+                 ActionListener *const listener = nullptr,
                  const std::string &eventId = "");
 
         A_DELETE_COPY(DropDown)
@@ -82,31 +77,31 @@ class DropDown final : public gcn::ActionListener,
          */
         void updateAlpha();
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void drawFrame(gcn::Graphics *graphics) override final;
+        void drawFrame(Graphics *graphics) override final;
 
         // Inherited from KeyListener
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
         // Inherited from MouseListener
 
-        void mousePressed(gcn::MouseEvent& mouseEvent) override final;
+        void mousePressed(MouseEvent& mouseEvent) override final;
 
-        void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
+        void mouseReleased(MouseEvent& mouseEvent) override final;
 
-        void mouseDragged(gcn::MouseEvent& mouseEvent) override final;
+        void mouseDragged(MouseEvent& mouseEvent) override final;
 
-        void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
+        void mouseWheelMovedUp(MouseEvent& mouseEvent) override final;
 
-        void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
+        void mouseWheelMovedDown(MouseEvent& mouseEvent) override final;
 
         void setSelectedString(const std::string &str);
 
         std::string getSelectedString() const A_WARN_UNUSED;
 
-        void valueChanged(const gcn::SelectionEvent& event) override final;
+        void valueChanged(const SelectionEvent& event) override final;
 
         void updateSelection();
 
@@ -122,17 +117,17 @@ class DropDown final : public gcn::ActionListener,
 
         void setSelected(int selected);
 
-        void setListModel(gcn::ListModel *const listModel);
+        void setListModel(ListModel *const listModel);
 
-        gcn::ListModel *getListModel();
+        ListModel *getListModel();
 
         void addSelectionListener(SelectionListener* listener);
 
         void removeSelectionListener(SelectionListener* selectionListener);
 
-        gcn::Rectangle getChildrenArea() override;
+        Rect getChildrenArea() override;
 
-        void action(const gcn::ActionEvent &actionEvent) override;
+        void action(const ActionEvent &actionEvent) override;
 
         void distributeValueChangedEvent();
 
@@ -142,11 +137,11 @@ class DropDown final : public gcn::ActionListener,
          *
          * @param graphics a Graphics object to draw with.
          */
-        void drawButton(gcn::Graphics *graphics);
+        void drawButton(Graphics *graphics);
 
         PopupList *mPopup;
-        gcn::Color mShadowColor;
-        gcn::Color mHighlightColor;
+        Color mShadowColor;
+        Color mHighlightColor;
         int mPadding;
         int mImagePadding;
         int mSpacing;
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 73547b770..c8e4bc2d9 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -36,12 +36,12 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
-DropShortcutContainer::DropShortcutContainer():
-    ShortcutContainer(),
+DropShortcutContainer::DropShortcutContainer(Widget2 *const widget):
+    ShortcutContainer(widget),
     mItemClicked(false),
     mItemPopup(new ItemPopup),
     mEquipedColor(getThemeColor(Theme::ITEM_EQUIPPED)),
@@ -94,7 +94,7 @@ void DropShortcutContainer::setWidget2(const Widget2 *const widget)
     mUnEquipedColor2 = getThemeColor(Theme::ITEM_NOT_EQUIPPED_OUTLINE);
 }
 
-void DropShortcutContainer::draw(gcn::Graphics *graphics)
+void DropShortcutContainer::draw(Graphics *graphics)
 {
     if (!dropShortcut)
         return;
@@ -107,8 +107,7 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
             mBackgroundImg->setAlpha(mAlpha);
     }
 
-    Graphics *const g = static_cast<Graphics*>(graphics);
-    drawBackground(g);
+    drawBackground(graphics);
 
     const Inventory *const inv = PlayerInfo::getInventory();
     if (!inv)
@@ -117,7 +116,7 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
         return;
     }
 
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     for (unsigned i = 0; i < mMaxItems; i++)
     {
@@ -144,12 +143,12 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
                     caption = "Eq.";
 
                 image->setAlpha(1.0F);
-                g->drawImage2(image, itemX, itemY);
+                graphics->drawImage(image, itemX, itemY);
                 if (item->isEquipped())
-                    g->setColorAll(mEquipedColor, mEquipedColor2);
+                    graphics->setColorAll(mEquipedColor, mEquipedColor2);
                 else
-                    g->setColorAll(mUnEquipedColor, mUnEquipedColor2);
-                font->drawString(g, caption,
+                    graphics->setColorAll(mUnEquipedColor, mUnEquipedColor2);
+                font->drawString(graphics, caption,
                     itemX + (mBoxWidth - font->getWidth(caption)) / 2,
                     itemY + mBoxHeight - 14);
             }
@@ -158,12 +157,12 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
     BLOCK_END("DropShortcutContainer::draw")
 }
 
-void DropShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+void DropShortcutContainer::mouseDragged(MouseEvent &event)
 {
     if (!dropShortcut)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (dragDrop.isEmpty() && mItemClicked)
         {
@@ -197,7 +196,7 @@ void DropShortcutContainer::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void DropShortcutContainer::mousePressed(gcn::MouseEvent &event)
+void DropShortcutContainer::mousePressed(MouseEvent &event)
 {
     if (!dropShortcut || !inventoryWindow)
         return;
@@ -208,7 +207,7 @@ void DropShortcutContainer::mousePressed(gcn::MouseEvent &event)
         return;
 
     const int eventButton = event.getButton();
-    if (eventButton == gcn::MouseEvent::LEFT)
+    if (eventButton == MouseEvent::LEFT)
     {
         if (dropShortcut->getItem(index) > 0)
         {
@@ -224,7 +223,7 @@ void DropShortcutContainer::mousePressed(gcn::MouseEvent &event)
             }
         }
     }
-    else if (eventButton == gcn::MouseEvent::RIGHT)
+    else if (eventButton == MouseEvent::RIGHT)
     {
         const Inventory *const inv = PlayerInfo::getInventory();
         if (!inv)
@@ -238,12 +237,12 @@ void DropShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void DropShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+void DropShortcutContainer::mouseReleased(MouseEvent &event)
 {
     if (!dropShortcut)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (dropShortcut->isItemSelected())
             dropShortcut->setItemSelected(-1);
@@ -270,7 +269,7 @@ void DropShortcutContainer::mouseReleased(gcn::MouseEvent &event)
 }
 
 // Show ItemTooltip
-void DropShortcutContainer::mouseMoved(gcn::MouseEvent &event)
+void DropShortcutContainer::mouseMoved(MouseEvent &event)
 {
     if (!dropShortcut)
         return;
@@ -303,13 +302,13 @@ void DropShortcutContainer::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void DropShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void DropShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
 }
 
-void DropShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void DropShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index b5a144cba..1888292de 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -38,7 +38,7 @@ class DropShortcutContainer final : public ShortcutContainer
         /**
          * Constructor. Initializes the graphic.
          */
-        DropShortcutContainer();
+        explicit DropShortcutContainer(Widget2 *const widget);
 
         A_DELETE_COPY(DropShortcutContainer)
 
@@ -50,28 +50,28 @@ class DropShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
         void setWidget2(const Widget2 *const widget) override final;
 
@@ -79,10 +79,10 @@ class DropShortcutContainer final : public ShortcutContainer
         bool mItemClicked;
 
         ItemPopup *mItemPopup;
-        gcn::Color mEquipedColor;
-        gcn::Color mEquipedColor2;
-        gcn::Color mUnEquipedColor;
-        gcn::Color mUnEquipedColor2;
+        Color mEquipedColor;
+        Color mEquipedColor2;
+        Color mUnEquipedColor;
+        Color mUnEquipedColor2;
 };
 
 #endif  // GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index f2f84ed56..139082815 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -34,10 +34,9 @@ namespace
 }  // namespace
 
 EmotePage::EmotePage(const Widget2 *const widget) :
-    gcn::Widget(),
-    Widget2(widget),
-    gcn::MouseListener(),
-    gcn::WidgetListener(),
+    Widget(widget),
+    MouseListener(),
+    WidgetListener(),
     mEmotes(ResourceManager::getInstance()->getImageSet(
         "graphics/sprites/chatemotes.png", emoteWidth, emoteHeight)),
     mVertexes(new ImageCollection),
@@ -59,7 +58,7 @@ EmotePage::~EmotePage()
     mVertexes = nullptr;
 }
 
-void EmotePage::draw(gcn::Graphics *graphics)
+void EmotePage::draw(Graphics *graphics)
 {
     BLOCK_START("EmotePage::draw")
 
@@ -68,7 +67,6 @@ void EmotePage::draw(gcn::Graphics *graphics)
 
     const std::vector<Image*> &images = mEmotes->getImages();
 
-    Graphics *const g = static_cast<Graphics*>(graphics);
     const unsigned int width = mDimension.width;
     unsigned int x = 0;
     unsigned int y = 0;
@@ -84,7 +82,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
                 const Image *const image = *it;
                 if (image)
                 {
-                    g->calcTileCollection(mVertexes, image, x, y);
+                    graphics->calcTileCollection(mVertexes, image, x, y);
                     x += emoteWidth;
                     if (x + emoteWidth > width)
                     {
@@ -94,7 +92,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
                 }
             }
         }
-        g->drawTileCollection(mVertexes);
+        graphics->drawTileCollection(mVertexes);
     }
     else
     {
@@ -103,7 +101,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
             const Image *const image = *it;
             if (image)
             {
-                g->drawImage2(image, x, y);
+                graphics->drawImage(image, x, y);
                 x += emoteWidth;
                 if (x + emoteWidth > width)
                 {
@@ -117,7 +115,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
     BLOCK_END("EmotePage::draw")
 }
 
-void EmotePage::mousePressed(gcn::MouseEvent &mouseEvent)
+void EmotePage::mousePressed(MouseEvent &mouseEvent)
 {
     mSelectedIndex = getIndexFromGrid(mouseEvent.getX(), mouseEvent.getY());
     distributeActionEvent();
@@ -140,12 +138,12 @@ void EmotePage::resetAction()
     mSelectedIndex = -1;
 }
 
-void EmotePage::widgetResized(const gcn::Event &event A_UNUSED)
+void EmotePage::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void EmotePage::widgetMoved(const gcn::Event &event A_UNUSED)
+void EmotePage::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 132cfb8e9..2ce50f1fc 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -21,18 +21,16 @@
 #ifndef GUI_WIDGETS_EMOTEPAGE_H
 #define GUI_WIDGETS_EMOTEPAGE_H
 
-#include "gui/widgets/widget2.h"
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/widgets/widget.h"
 
 #include "localconsts.h"
 
-class EmotePage final : public gcn::Widget,
-                        public Widget2,
-                        public gcn::MouseListener,
-                        public gcn::WidgetListener
+class EmotePage final : public Widget,
+                        public MouseListener,
+                        public WidgetListener
 {
     public:
         explicit EmotePage(const Widget2 *const widget);
@@ -41,15 +39,15 @@ class EmotePage final : public gcn::Widget,
 
         ~EmotePage();
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void mousePressed(gcn::MouseEvent &mouseEvent) override final;
+        void mousePressed(MouseEvent &mouseEvent) override final;
 
         int getIndexFromGrid(const int x, const int y) const;
 
-        void widgetResized(const gcn::Event &event A_UNUSED) override final;
+        void widgetResized(const Event &event A_UNUSED) override final;
 
-        void widgetMoved(const gcn::Event &event A_UNUSED) override final;
+        void widgetMoved(const Event &event A_UNUSED) override final;
 
         void resetAction();
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index d080a6072..296f21126 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -27,20 +27,21 @@
 
 #include "input/inputmanager.h"
 
+#include "gui/font.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/textpopup.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "resources/db/emotedb.h"
 
 #include "debug.h"
 
 static const int MAX_ITEMS = 48;
 
-EmoteShortcutContainer::EmoteShortcutContainer():
-    ShortcutContainer(),
+EmoteShortcutContainer::EmoteShortcutContainer(Widget2 *const widget) :
+    ShortcutContainer(widget),
     mEmoteImg(),
     mEmotePopup(new TextPopup),
     mEmoteClicked(false),
@@ -99,7 +100,7 @@ void EmoteShortcutContainer::setWidget2(const Widget2 *const widget)
     mForegroundColor2 = getThemeColor(Theme::TEXT_OUTLINE);
 }
 
-void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
+void EmoteShortcutContainer::draw(Graphics *graphics)
 {
     if (!emoteShortcut)
         return;
@@ -112,11 +113,10 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
         mAlpha = client->getGuiAlpha();
     }
 
-    Graphics *const g = static_cast<Graphics *const>(graphics);
-    gcn::Font *const font = getFont();
-    drawBackground(g);
+    Font *const font = getFont();
+    drawBackground(graphics);
 
-    g->setColorAll(mForegroundColor, mForegroundColor2);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     for (unsigned i = 0; i < mMaxItems; i++)
     {
         const int emoteX = (i % mGridWidth) * mBoxWidth;
@@ -126,7 +126,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
         const std::string key = inputManager.getKeyValueString(
             Input::KEY_EMOTE_1 + i);
 
-        font->drawString(g, key, emoteX + 2, emoteY + 2);
+        font->drawString(graphics, key, emoteX + 2, emoteY + 2);
     }
     unsigned sz = static_cast<unsigned>(mEmoteImg.size());
     if (sz > mMaxItems)
@@ -139,7 +139,8 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
             const AnimatedSprite *const sprite = emoteImg->sprite;
             if (sprite)
             {
-                sprite->draw(g, (i % mGridWidth) * mBoxWidth + 2,
+                sprite->draw(graphics,
+                    (i % mGridWidth) * mBoxWidth + 2,
                     (i / mGridWidth) * mBoxHeight + 10);
             }
         }
@@ -148,11 +149,11 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
     BLOCK_END("EmoteShortcutContainer::draw")
 }
 
-void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event A_UNUSED)
+void EmoteShortcutContainer::mouseDragged(MouseEvent &event A_UNUSED)
 {
 }
 
-void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event)
+void EmoteShortcutContainer::mousePressed(MouseEvent &event)
 {
     if (!emoteShortcut)
         return;
@@ -174,12 +175,12 @@ void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+void EmoteShortcutContainer::mouseReleased(MouseEvent &event)
 {
     if (!emoteShortcut)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         const int index = getIndexFromGrid(event.getX(), event.getY());
 
@@ -206,7 +207,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
     }
 }
 
-void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event)
+void EmoteShortcutContainer::mouseMoved(MouseEvent &event)
 {
     if (!emoteShortcut || !mEmotePopup)
         return;
@@ -226,13 +227,13 @@ void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void EmoteShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mEmotePopup)
         mEmotePopup->setVisible(false);
 }
 
-void EmoteShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void EmoteShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mEmotePopup)
         mEmotePopup->setVisible(false);
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 2c99aaf87..a3061441f 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -24,12 +24,12 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include "resources/db/emotedb.h"
-
 #include <vector>
 
 class TextPopup;
 
+struct EmoteSprite;
+
 /**
  * An emote shortcut container. Used to quickly use emoticons.
  *
@@ -41,7 +41,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
         /**
          * Constructor. Initializes the graphic.
          */
-        EmoteShortcutContainer();
+        explicit EmoteShortcutContainer(Widget2 *const widget);
 
         A_DELETE_COPY(EmoteShortcutContainer)
 
@@ -53,28 +53,28 @@ class EmoteShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         void setWidget2(const Widget2 *const widget) override final;
 
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index bd3a35964..7245ddd19 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -20,16 +20,18 @@
 
 #include "gui/widgets/extendedlistbox.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
 
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/font.h"
+
+#include "gui/models/listmodel.h"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 ExtendedListBox::ExtendedListBox(const Widget2 *const widget,
-                                 gcn::ListModel *const listModel,
+                                 ListModel *const listModel,
                                  const std::string &skin,
                                  const int rowHeight) :
     ListBox(widget, listModel, skin),
@@ -47,7 +49,7 @@ ExtendedListBox::~ExtendedListBox()
 {
 }
 
-void ExtendedListBox::draw(gcn::Graphics *graphics)
+void ExtendedListBox::draw(Graphics *graphics)
 {
     if (!mListModel)
         return;
@@ -55,10 +57,9 @@ void ExtendedListBox::draw(gcn::Graphics *graphics)
     BLOCK_START("ExtendedListBox::draw")
     ExtendedListModel *const model = static_cast<ExtendedListModel* const>(
         mListModel);
-    Graphics *const g = static_cast<Graphics *const>(graphics);
 
     updateAlpha();
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     const int height = mRowHeight;
     const int pad2 = 2 + mPadding;
@@ -133,7 +134,7 @@ void ExtendedListBox::draw(gcn::Graphics *graphics)
     {
         mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
         graphics->setColor(mHighlightColor);
-        graphics->fillRectangle(gcn::Rectangle(mPadding, minY + mPadding,
+        graphics->fillRectangle(Rect(mPadding, minY + mPadding,
             width - pad2, maxY - minY + height));
     }
 
@@ -146,13 +147,14 @@ void ExtendedListBox::draw(gcn::Graphics *graphics)
             const Image *const image = model->getImageAt(row1);
             if (image)
             {
-                g->drawImage2(image, mImagePadding, item.y + (height
-                    - image->getHeight()) / 2 + mPadding);
+                graphics->drawImage(image,
+                    mImagePadding,
+                    item.y + (height - image->getHeight()) / 2 + mPadding);
             }
         }
     }
 
-    g->setColorAll(mForegroundColor, mForegroundColor2);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
 
     for (int f = 0; f < itemsSz; ++f)
     {
@@ -180,13 +182,14 @@ void ExtendedListBox::draw(gcn::Graphics *graphics)
             const Image *const image = model->getImageAt(row1);
             if (image)
             {
-                g->drawImage2(image, mImagePadding, item.y + (height
-                    - image->getHeight()) / 2 + mPadding);
+                graphics->drawImage(image,
+                    mImagePadding,
+                    item.y + (height - image->getHeight()) / 2 + mPadding);
             }
         }
     }
 
-    g->setColorAll(mForegroundSelectedColor, mForegroundSelectedColor2);
+    graphics->setColorAll(mForegroundSelectedColor, mForegroundSelectedColor2);
 
     for (int f = 0; f < selSz; ++f)
     {
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 30e7a32fb..ae94cde02 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -48,7 +48,7 @@ class ExtendedListBox final : public ListBox
          * Constructor.
          */
         ExtendedListBox(const Widget2 *const widget,
-                        gcn::ListModel *const listModel,
+                        ListModel *const listModel,
                         const std::string &skin,
                         const int rowHeight = 13);
 
@@ -59,7 +59,7 @@ class ExtendedListBox final : public ListBox
         /**
          * Draws the list box.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         void adjustSize() override;
 
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index d39a7124a..e9b5c1e0c 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -24,9 +24,10 @@
 #include "debug.h"
 
 FlowContainer::FlowContainer(const Widget2 *const widget,
-                             const int boxWidth, const int boxHeight) :
+                             const int boxWidth,
+                             const int boxHeight) :
     Container(widget),
-    gcn::WidgetListener(),
+    WidgetListener(),
     mBoxWidth(boxWidth),
     mBoxHeight(boxHeight),
     mGridWidth(1),
@@ -39,7 +40,7 @@ FlowContainer::FlowContainer(const Widget2 *const widget,
         mBoxHeight = 1;
 }
 
-void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void FlowContainer::widgetResized(const Event &event A_UNUSED)
 {
     if (getWidth() < mBoxWidth)
     {
@@ -85,12 +86,12 @@ void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED)
     }
 }
 
-void FlowContainer::add(gcn::Widget *widget)
+void FlowContainer::add(Widget *widget)
 {
     if (!widget)
         return;
 
     Container::add(widget);
     widget->setSize(mBoxWidth, mBoxHeight);
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 81043b450..7266bb06a 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -34,14 +34,15 @@
  * \ingroup GUI
  */
 class FlowContainer final : public Container,
-                            public gcn::WidgetListener
+                            public WidgetListener
 {
     public:
         /**
          * Constructor. Initializes the shortcut container.
          */
         FlowContainer(const Widget2 *const widget,
-                      const int boxWidth, const int boxHeight);
+                      const int boxWidth,
+                      const int boxHeight);
 
         A_DELETE_COPY(FlowContainer)
 
@@ -55,7 +56,7 @@ class FlowContainer final : public Container,
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         int getBoxWidth() const A_WARN_UNUSED
         { return mBoxWidth; }
@@ -63,7 +64,7 @@ class FlowContainer final : public Container,
         int getBoxHeight() const A_WARN_UNUSED
         { return mBoxHeight; }
 
-        void add(gcn::Widget *widget) override final;
+        void add(Widget *widget) override final;
 
     private:
         int mBoxWidth;
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index ae0dd14c5..70ebb77d6 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -24,44 +24,47 @@
 
 #include "client.h"
 
-#include "input/keyevent.h"
+#include "gui/gui.h"
+
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
 
 #include "utils/dtor.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/key.hpp>
+#include "listeners/actionlistener.h"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 float GuiTable::mAlpha = 1.0;
 
-class GuiTableActionListener final : public gcn::ActionListener
+class GuiTableActionListener final : public ActionListener
 {
 public:
     GuiTableActionListener(GuiTable *restrict _table,
-                           gcn::Widget *restrict _widget,
+                           Widget *restrict _widget,
                            int _row, int _column);
 
     A_DELETE_COPY(GuiTableActionListener)
 
     ~GuiTableActionListener();
 
-    void action(const gcn::ActionEvent& actionEvent) override final;
+    void action(const ActionEvent& actionEvent) override final;
 
 protected:
     GuiTable *mTable;
     int mRow;
     int mColumn;
-    gcn::Widget *mWidget;
+    Widget *mWidget;
 };
 
 
 GuiTableActionListener::GuiTableActionListener(GuiTable *restrict table,
-                                               gcn::Widget *restrict widget,
+                                               Widget *restrict widget,
                                                int row, int column) :
-    gcn::ActionListener(),
+    ActionListener(),
     mTable(table),
     mRow(row),
     mColumn(column),
@@ -83,8 +86,7 @@ GuiTableActionListener::~GuiTableActionListener()
     }
 }
 
-void GuiTableActionListener::action(const gcn::ActionEvent
-                                    &actionEvent A_UNUSED)
+void GuiTableActionListener::action(const ActionEvent &actionEvent A_UNUSED)
 {
     mTable->setSelected(mRow, mColumn);
     mTable->distributeActionEvent();
@@ -92,11 +94,11 @@ void GuiTableActionListener::action(const gcn::ActionEvent
 
 
 GuiTable::GuiTable(const Widget2 *const widget,
-                   TableModel *const initial_model, const bool opacity) :
-    gcn::Widget(),
-    Widget2(widget),
-    gcn::MouseListener(),
-    gcn::KeyListener(),
+                   TableModel *const initial_model,
+                   const bool opacity) :
+    Widget(widget),
+    MouseListener(),
+    KeyListener(),
     mModel(nullptr),
     mTopWidget(nullptr),
     mActionListeners(),
@@ -280,7 +282,7 @@ void GuiTable::installActionListeners()
     {
         for (int column = 0; column < columns; ++column)
         {
-            gcn::Widget *const widget = mModel->getElementAt(row, column);
+            Widget *const widget = mModel->getElementAt(row, column);
             if (widget)
             {
                 mActionListeners.push_back(new GuiTableActionListener(
@@ -293,7 +295,7 @@ void GuiTable::installActionListeners()
 }
 
 // -- widget ops
-void GuiTable::draw(gcn::Graphics* graphics)
+void GuiTable::draw(Graphics* graphics)
 {
     if (!mModel || !getRowHeight())
         return;
@@ -302,7 +304,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
     if (client->getGuiAlpha() != mAlpha)
         mAlpha = client->getGuiAlpha();
 
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     const int width = rect.width;
     const int height = rect.height;
     const int y = rect.y;
@@ -310,7 +312,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
     {
         mBackgroundColor.a = static_cast<int>(mAlpha * 255.0F);
         graphics->setColor(mBackgroundColor);
-        graphics->fillRectangle(gcn::Rectangle(0, 0, width, height));
+        graphics->fillRectangle(Rect(0, 0, width, height));
     }
 
     // First, determine how many rows we need to draw,
@@ -345,11 +347,11 @@ void GuiTable::draw(gcn::Graphics* graphics)
 
         for (unsigned c = first_column; c + 1 <= last_column1; ++c)
         {
-            gcn::Widget *const widget = mModel->getElementAt(r, c);
+            Widget *const widget = mModel->getElementAt(r, c);
             const int cWidth = getColumnWidth(c);
             if (widget)
             {
-                gcn::Rectangle bounds(x_offset, y_offset, cWidth, rHeight);
+                Rect bounds(x_offset, y_offset, cWidth, rHeight);
 
                 if (widget == mTopWidget)
                 {
@@ -367,14 +369,14 @@ void GuiTable::draw(gcn::Graphics* graphics)
                     if (mLinewiseMode && r == static_cast<unsigned>(
                         mSelectedRow) && c == 0)
                     {
-                        graphics->fillRectangle(gcn::Rectangle(0, y_offset,
+                        graphics->fillRectangle(Rect(0, y_offset,
                             width, rHeight));
                     }
                     else if (!mLinewiseMode && mSelectedColumn > 0
                              && c == static_cast<unsigned>(mSelectedColumn)
                              && r == static_cast<unsigned>(mSelectedRow))
                     {
-                        graphics->fillRectangle(gcn::Rectangle(
+                        graphics->fillRectangle(Rect(
                             x_offset, y_offset, cWidth, rHeight));
                     }
                 }
@@ -391,7 +393,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
 
     if (mTopWidget)
     {
-        const gcn::Rectangle &bounds = mTopWidget->getDimension();
+        const Rect &bounds = mTopWidget->getDimension();
         graphics->pushClipArea(bounds);
         mTopWidget->draw(graphics);
         graphics->popClipArea();
@@ -399,28 +401,28 @@ void GuiTable::draw(gcn::Graphics* graphics)
     BLOCK_END("GuiTable::draw")
 }
 
-void GuiTable::moveToTop(gcn::Widget *widget)
+void GuiTable::moveToTop(Widget *widget)
 {
-    gcn::Widget::moveToTop(widget);
+    Widget::moveToTop(widget);
     mTopWidget = widget;
 }
 
-void GuiTable::moveToBottom(gcn::Widget *widget)
+void GuiTable::moveToBottom(Widget *widget)
 {
-    gcn::Widget::moveToBottom(widget);
+    Widget::moveToBottom(widget);
     if (widget == mTopWidget)
         mTopWidget = nullptr;
 }
 
-gcn::Rectangle GuiTable::getChildrenArea()
+Rect GuiTable::getChildrenArea()
 {
-    return gcn::Rectangle(0, 0, mDimension.width, mDimension.height);
+    return Rect(0, 0, mDimension.width, mDimension.height);
 }
 
 // -- KeyListener notifications
-void GuiTable::keyPressed(gcn::KeyEvent& keyEvent)
+void GuiTable::keyPressed(KeyEvent& keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
 
     if (action == Input::KEY_GUI_SELECT)
     {
@@ -462,12 +464,12 @@ void GuiTable::keyPressed(gcn::KeyEvent& keyEvent)
 }
 
 // -- MouseListener notifications
-void GuiTable::mousePressed(gcn::MouseEvent& mouseEvent)
+void GuiTable::mousePressed(MouseEvent& mouseEvent)
 {
     if (!mModel || !mSelectable)
         return;
 
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
     {
         const int row = getRowForY(mouseEvent.getY());
         const int column = getColumnForX(mouseEvent.getX());
@@ -483,7 +485,7 @@ void GuiTable::mousePressed(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
+void GuiTable::mouseWheelMovedUp(MouseEvent& mouseEvent)
 {
     if (isFocused())
     {
@@ -494,7 +496,7 @@ void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
+void GuiTable::mouseWheelMovedDown(MouseEvent& mouseEvent)
 {
     if (isFocused())
     {
@@ -503,9 +505,9 @@ void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent)
+void GuiTable::mouseDragged(MouseEvent& mouseEvent)
 {
-    if (mouseEvent.getButton() != gcn::MouseEvent::LEFT)
+    if (mouseEvent.getButton() != MouseEvent::LEFT)
         return;
 
     // Make table selection update on drag
@@ -530,7 +532,7 @@ void GuiTable::modelUpdated(const bool completed)
     }
 }
 
-gcn::Widget *GuiTable::getWidgetAt(int x, int y)
+Widget *GuiTable::getWidgetAt(int x, int y)
 {
     const int row = getRowForY(y);
     const int column = getColumnForX(x);
@@ -540,7 +542,7 @@ gcn::Widget *GuiTable::getWidgetAt(int x, int y)
 
     if (mModel && row > -1 && column > -1)
     {
-        gcn::Widget *const w = mModel->getElementAt(row, column);
+        Widget *const w = mModel->getElementAt(row, column);
         if (w && w->isFocusable())
             return w;
         else
@@ -586,14 +588,14 @@ int GuiTable::getColumnForX(int x) const
         return column;
 }
 
-void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler)
+void GuiTable::_setFocusHandler(FocusHandler* focusHandler)
 {
 // add check for focusHandler. may be need remove it?
 
     if (!mModel || !focusHandler)
         return;
 
-    gcn::Widget::_setFocusHandler(focusHandler);
+    Widget::_setFocusHandler(focusHandler);
 
     const int rows = mModel->getRows();
     const int cols = mModel->getColumns();
@@ -601,7 +603,7 @@ void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler)
     {
         for (int c = 0; c < cols ; ++c)
         {
-            gcn::Widget *const w = mModel->getElementAt(r, c);
+            Widget *const w = mModel->getElementAt(r, c);
             if (w)
                 w->_setFocusHandler(focusHandler);
         }
@@ -612,5 +614,5 @@ void GuiTable::requestFocus()
 {
     if (!mFocusHandler)
         return;
-    gcn::Widget::requestFocus();
+    Widget::requestFocus();
 }
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 5529ce842..fb0c34784 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -25,12 +25,12 @@
 
 #include "localconsts.h"
 
-#include "gui/widgets/tablemodel.h"
-#include "gui/widgets/widget2.h"
+#include "gui/models/tablemodel.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 #include <vector>
 
@@ -45,10 +45,9 @@ class GuiTableActionListener;
  *
  * \ingroup GUI
  */
-class GuiTable final : public gcn::Widget,
-                       public Widget2,
-                       public gcn::MouseListener,
-                       public gcn::KeyListener,
+class GuiTable final : public Widget,
+                       public MouseListener,
+                       public KeyListener,
                        public TableModelListener
 {
     // so that the action listener can call distributeActionEvent
@@ -94,7 +93,7 @@ public:
     void setWrappingEnabled(bool wrappingEnabled)
     { mWrappingEnabled = wrappingEnabled; }
 
-    gcn::Rectangle getChildrenArea() override final A_WARN_UNUSED;
+    Rect getChildrenArea() override final A_WARN_UNUSED;
 
     /**
      * Toggle whether to use linewise selection mode, in which the table selects
@@ -113,18 +112,18 @@ public:
     }
 
     // Inherited from Widget
-    void draw(gcn::Graphics* graphics) override final;
+    void draw(Graphics* graphics) override final;
 
-    gcn::Widget *getWidgetAt(int x, int y) override final A_WARN_UNUSED;
+    Widget *getWidgetAt(int x, int y) override final A_WARN_UNUSED;
 
-    void moveToTop(gcn::Widget *child) override final;
+    void moveToTop(Widget *child) override final;
 
-    void moveToBottom(gcn::Widget *child) override final;
+    void moveToBottom(Widget *child) override final;
 
-    void _setFocusHandler(gcn::FocusHandler* focusHandler) override final;
+    void _setFocusHandler(FocusHandler* focusHandler) override final;
 
     // Inherited from KeyListener
-    void keyPressed(gcn::KeyEvent& keyEvent) override final;
+    void keyPressed(KeyEvent& keyEvent) override final;
 
     /**
      * Sets the table to be opaque, that is sets the table
@@ -145,13 +144,13 @@ public:
     { return mOpaque; }
 
     // Inherited from MouseListener
-    void mousePressed(gcn::MouseEvent& mouseEvent) override final;
+    void mousePressed(MouseEvent& mouseEvent) override final;
 
-    void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
+    void mouseWheelMovedUp(MouseEvent& mouseEvent) override final;
 
-    void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
+    void mouseWheelMovedDown(MouseEvent& mouseEvent) override final;
 
-    void mouseDragged(gcn::MouseEvent& mouseEvent) override final;
+    void mouseDragged(MouseEvent& mouseEvent) override final;
 
     // Constraints inherited from TableModelListener
     void modelUpdated(const bool completed) override final;
@@ -181,7 +180,7 @@ private:
     TableModel *mModel;
 
     /** If someone moves a fresh widget to the top, we must display it. */
-    gcn::Widget *mTopWidget;
+    Widget *mTopWidget;
 
     /** Vector for compactness; used as a list in practice. */
     std::vector<GuiTableActionListener *> mActionListeners;
@@ -189,7 +188,7 @@ private:
     /**
      * Holds the background color of the table.
      */
-    gcn::Color mHighlightColor;
+    Color mHighlightColor;
 
     int mSelectedRow;
     int mSelectedColumn;
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index a4c95169a..8e3be9662 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -24,9 +24,10 @@
 #include "debug.h"
 
 HorizontContainer::HorizontContainer(const Widget2 *const widget,
-                                     const int height, const int spacing) :
+                                     const int height,
+                                     const int spacing) :
     Container(widget),
-    gcn::WidgetListener(),
+    WidgetListener(),
     mSpacing(spacing),
     mCount(0),
     mLastX(spacing)
@@ -35,12 +36,12 @@ HorizontContainer::HorizontContainer(const Widget2 *const widget,
     addWidgetListener(this);
 }
 
-void HorizontContainer::add(gcn::Widget *widget)
+void HorizontContainer::add(Widget *widget)
 {
     add(widget, mSpacing);
 }
 
-void HorizontContainer::add(gcn::Widget *const widget, const int spacing)
+void HorizontContainer::add(Widget *const widget, const int spacing)
 {
     if (!widget)
         return;
@@ -58,6 +59,6 @@ void HorizontContainer::clear()
     mCount = 0;
 }
 
-void HorizontContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void HorizontContainer::widgetResized(const Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index be30220e8..bef3d0b00 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -33,21 +33,23 @@
  *
  * This container places it's contents veritcally.
  */
-class HorizontContainer final : public Container, public gcn::WidgetListener
+class HorizontContainer final : public Container,
+                                public WidgetListener
 {
     public:
         HorizontContainer(const Widget2 *const widget,
-                          const int height, const int spacing);
+                          const int height,
+                          const int spacing);
 
         A_DELETE_COPY(HorizontContainer)
 
-        void add(gcn::Widget *widget) override final;
+        void add(Widget *widget) override final;
 
-        void add(gcn::Widget *const widget, const int spacing);
+        void add(Widget *const widget, const int spacing);
 
         void clear() override;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     protected:
         int mSpacing;
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 4fb511c85..9a86fc9bf 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -22,14 +22,16 @@
 
 #include "gui/widgets/icon.h"
 
+#include "gui/gui.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
 #include "debug.h"
 
-Icon::Icon(const Widget2 *const widget, const std::string &file) :
-    gcn::Widget(),
-    Widget2(widget),
+Icon::Icon(const Widget2 *const widget,
+           const std::string &file) :
+    Widget(widget),
     mImage(ResourceManager::getInstance()->getImage(file))
 {
     if (mImage)
@@ -39,9 +41,9 @@ Icon::Icon(const Widget2 *const widget, const std::string &file) :
     }
 }
 
-Icon::Icon(const Widget2 *const widget, Image *const image) :
-    gcn::Widget(),
-    Widget2(widget),
+Icon::Icon(const Widget2 *const widget,
+           Image *const image) :
+    Widget(widget),
     mImage(image)
 {
     if (mImage)
@@ -67,13 +69,12 @@ void Icon::setImage(Image *const image)
     }
 }
 
-void Icon::draw(gcn::Graphics *g)
+void Icon::draw(Graphics *graphics)
 {
     BLOCK_START("Icon::draw")
     if (mImage)
     {
-        Graphics *const graphics = static_cast<Graphics*>(g);
-        graphics->drawImage2(mImage,
+        graphics->drawImage(mImage,
             (mDimension.width - mImage->mBounds.w) / 2,
             (mDimension.height - mImage->mBounds.h) / 2);
     }
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 1cbd3158c..1e015f8e6 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -23,9 +23,7 @@
 #ifndef GUI_WIDGETS_ICON_H
 #define GUI_WIDGETS_ICON_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widget.hpp>
+#include "gui/widgets/widget.h"
 
 #include "localconsts.h"
 
@@ -36,19 +34,20 @@ class Image;
  *
  * \ingroup GUI
  */
-class Icon final : public gcn::Widget,
-                   public Widget2
+class Icon final : public Widget
 {
     public:
         /**
          * Constructor.
          */
-        Icon(const Widget2 *const widget, const std::string &filename);
+        Icon(const Widget2 *const widget,
+             const std::string &filename);
 
         /**
          * Constructor, uses an existing Image.
          */
-        Icon(const Widget2 *const widget, Image *const image);
+        Icon(const Widget2 *const widget,
+             Image *const image);
 
         A_DELETE_COPY(Icon)
 
@@ -68,7 +67,7 @@ class Icon final : public gcn::Widget,
         /**
          * Draws the Icon.
          */
-        void draw(gcn::Graphics *g) override final;
+        void draw(Graphics *g) override final;
 
     private:
         Image *mImage;
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index e50bd232b..160cfe5de 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -26,15 +26,19 @@
 #include "gui/sdlinput.h"
 #endif
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "utils/stringutils.h"
 #include "debug.h"
 
-IntTextField::IntTextField(const Widget2 *const widget, const int def,
-                           const int min, const int max,
-                           const bool enabled, const int width) :
+IntTextField::IntTextField(const Widget2 *const widget,
+                           const int def,
+                           const int min,
+                           const int max,
+                           const bool enabled,
+                           const int width) :
     TextField(widget, toString(def)),
     mMin(0),
     mMax(0),
@@ -49,9 +53,9 @@ IntTextField::IntTextField(const Widget2 *const widget, const int def,
         setWidth(width);
 }
 
-void IntTextField::keyPressed(gcn::KeyEvent &event)
+void IntTextField::keyPressed(KeyEvent &event)
 {
-    const int action = static_cast<KeyEvent*>(&event)->getActionId();
+    const int action = event.getActionId();
 
     if (action == Input::KEY_GUI_DELETE || action == Input::KEY_GUI_BACKSPACE)
     {
@@ -67,7 +71,7 @@ void IntTextField::keyPressed(gcn::KeyEvent &event)
     if (val != Key::TEXTINPUT)
         return;
 
-    const std::string str = static_cast<KeyEvent*>(&event)->getText();
+    const std::string str = event.getText();
     if (str.empty())
         return;
     const size_t sz = str.size();
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 3493cf52b..91b076e30 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -34,9 +34,12 @@ class IntTextField final : public TextField
         /**
          * Constructor, sets default value.
          */
-        explicit IntTextField(const Widget2 *const widget, const int def = 0,
-                              const int min = 0, const int max = 0,
-                              const bool enabled = true, const int width = 0);
+        explicit IntTextField(const Widget2 *const widget,
+                              const int def = 0,
+                              const int min = 0,
+                              const int max = 0,
+                              const bool enabled = true,
+                              const int width = 0);
 
         A_DELETE_COPY(IntTextField)
 
@@ -68,7 +71,7 @@ class IntTextField final : public TextField
         /**
          * Responds to key presses.
          */
-        void keyPressed(gcn::KeyEvent &event) override final;
+        void keyPressed(KeyEvent &event) override final;
 
     private:
         int mMin;            /**< Minimum value */
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 2014d3ffe..fe666e6f7 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -46,8 +46,8 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "gui/font.h"
+#include "listeners/selectionlistener.h"
 
 #include <algorithm>
 
@@ -158,11 +158,10 @@ namespace
 ItemContainer::ItemContainer(const Widget2 *const widget,
                              Inventory *const inventory,
                              const bool forceQuantity) :
-    gcn::Widget(),
-    Widget2(widget),
-    gcn::KeyListener(),
-    gcn::MouseListener(),
-    gcn::WidgetListener(),
+    Widget(widget),
+    KeyListener(),
+    MouseListener(),
+    WidgetListener(),
     mInventory(inventory),
     mSelImg(Theme::getImageFromThemeXml("item_selection.xml", "")),
     mProtectedImg(Theme::getImageFromTheme("lock.png")),
@@ -227,7 +226,7 @@ ItemContainer::~ItemContainer()
 void ItemContainer::logic()
 {
     BLOCK_START("ItemContainer::logic")
-    gcn::Widget::logic();
+    Widget::logic();
 
     if (!mInventory)
     {
@@ -245,14 +244,13 @@ void ItemContainer::logic()
     BLOCK_END("ItemContainer::logic")
 }
 
-void ItemContainer::draw(gcn::Graphics *graphics)
+void ItemContainer::draw(Graphics *graphics)
 {
     if (!mInventory || !mShowMatrix)
         return;
 
     BLOCK_START("ItemContainer::draw")
-    Graphics *const g = static_cast<Graphics *const>(graphics);
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     for (int j = 0; j < mGridRows; j++)
     {
@@ -278,16 +276,18 @@ void ItemContainer::draw(gcn::Graphics *graphics)
                 if (mShowMatrix[itemIndex] == mSelectedIndex)
                 {
                     if (mSelImg)
-                        g->drawImage2(mSelImg, itemX, itemY);
+                        graphics->drawImage(mSelImg, itemX, itemY);
                 }
                 image->setAlpha(1.0F);  // ensure the image if fully drawn...
-                g->drawImage2(image, itemX + mPaddingItemX,
+                graphics->drawImage(image,
+                    itemX + mPaddingItemX,
                     itemY + mPaddingItemY);
                 if (mProtectedImg && PlayerInfo::isItemProtected(
                     item->getId()))
                 {
-                    g->drawImage2(mProtectedImg,
-                        itemX + mPaddingItemX, itemY + mPaddingItemY);
+                    graphics->drawImage(mProtectedImg,
+                        itemX + mPaddingItemX,
+                        itemY + mPaddingItemY);
                 }
             }
         }
@@ -324,11 +324,11 @@ void ItemContainer::draw(gcn::Graphics *graphics)
             }
 
             if (item->isEquipped())
-                g->setColorAll(mEquipedColor, mEquipedColor2);
+                graphics->setColorAll(mEquipedColor, mEquipedColor2);
             else
-                g->setColorAll(mUnEquipedColor, mUnEquipedColor2);
+                graphics->setColorAll(mUnEquipedColor, mUnEquipedColor2);
 
-            font->drawString(g, caption,
+            font->drawString(graphics, caption,
                 itemX + (mBoxWidth - font->getWidth(caption)) / 2,
                 itemY + mEquippedTextPadding);
         }
@@ -373,7 +373,7 @@ void ItemContainer::distributeValueChangedEvent()
     {
         if (*i)
         {
-            gcn::SelectionEvent event(this);
+            SelectionEvent event(this);
             (*i)->valueChanged(event);
         }
     }
@@ -385,15 +385,15 @@ void ItemContainer::hidePopup()
         mItemPopup->setVisible(false);
 }
 
-void ItemContainer::keyPressed(gcn::KeyEvent &event A_UNUSED)
+void ItemContainer::keyPressed(KeyEvent &event A_UNUSED)
 {
 }
 
-void ItemContainer::keyReleased(gcn::KeyEvent &event A_UNUSED)
+void ItemContainer::keyReleased(KeyEvent &event A_UNUSED)
 {
 }
 
-void ItemContainer::mousePressed(gcn::MouseEvent &event)
+void ItemContainer::mousePressed(MouseEvent &event)
 {
     if (!mInventory)
         return;
@@ -401,7 +401,7 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
     const int button = event.getButton();
     mClicks = event.getClickCount();
 
-    if (button == gcn::MouseEvent::LEFT || button == gcn::MouseEvent::RIGHT)
+    if (button == MouseEvent::LEFT || button == MouseEvent::RIGHT)
     {
         const int index = getSlotIndex(event.getX(), event.getY());
         if (index == Inventory::NO_SLOT_INDEX)
@@ -467,13 +467,13 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void ItemContainer::mouseDragged(gcn::MouseEvent &event A_UNUSED)
+void ItemContainer::mouseDragged(MouseEvent &event A_UNUSED)
 {
     if (mSelectionStatus != SEL_NONE)
         mSelectionStatus = SEL_DRAGGING;
 }
 
-void ItemContainer::mouseReleased(gcn::MouseEvent &event)
+void ItemContainer::mouseReleased(MouseEvent &event)
 {
     if (mClicks == 2)
         return;
@@ -593,7 +593,7 @@ void ItemContainer::mouseReleased(gcn::MouseEvent &event)
     }
 }
 
-void ItemContainer::mouseMoved(gcn::MouseEvent &event)
+void ItemContainer::mouseMoved(MouseEvent &event)
 {
     if (!mInventory)
         return;
@@ -612,12 +612,12 @@ void ItemContainer::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void ItemContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void ItemContainer::mouseExited(MouseEvent &event A_UNUSED)
 {
     mItemPopup->setVisible(false);
 }
 
-void ItemContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void ItemContainer::widgetResized(const Event &event A_UNUSED)
 {
     mGridColumns = std::max(1, mDimension.width / mBoxWidth);
     adjustHeight();
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index f4a73af9f..f7bc44849 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -23,12 +23,11 @@
 #ifndef GUI_WIDGETS_ITEMCONTAINER_H
 #define GUI_WIDGETS_ITEMCONTAINER_H
 
-#include "gui/widgets/widget2.h"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/widgets/widget.h"
 
 #include <list>
 
@@ -38,22 +37,17 @@ class Image;
 class Inventory;
 class Item;
 class ItemPopup;
-
-namespace gcn
-{
-    class SelectionListener;
-}
+class SelectionListener;
 
 /**
  * An item container. Used to show items in inventory and trade dialog.
  *
  * \ingroup GUI
  */
-class ItemContainer final : public gcn::Widget,
-                            public Widget2,
-                            public gcn::KeyListener,
-                            public gcn::MouseListener,
-                            public gcn::WidgetListener
+class ItemContainer final : public Widget,
+                            public KeyListener,
+                            public MouseListener,
+                            public WidgetListener
 {
     public:
         /**
@@ -85,21 +79,21 @@ class ItemContainer final : public gcn::Widget,
         /**
          * Draws the items.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         // KeyListener
-        void keyPressed(gcn::KeyEvent &event) override final;
-        void keyReleased(gcn::KeyEvent &event) override final;
+        void keyPressed(KeyEvent &event) override final;
+        void keyReleased(KeyEvent &event) override final;
 
         // MouseListener
-        void mousePressed(gcn::MouseEvent &event) override final;
-        void mouseDragged(gcn::MouseEvent &event) override final;
-        void mouseReleased(gcn::MouseEvent &event) override final;
-        void mouseMoved(gcn::MouseEvent &event) override final;
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
         // WidgetListener
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         /**
          * Returns the selected item.
@@ -115,14 +109,14 @@ class ItemContainer final : public gcn::Widget,
          * Adds a listener to the list that's notified each time a change to
          * the selection occurs.
          */
-        void addSelectionListener(gcn::SelectionListener *listener)
+        void addSelectionListener(SelectionListener *listener)
         { mSelectionListeners.push_back(listener); }
 
         /**
          * Removes a listener from the list that's notified each time a change
          * to the selection occurs.
          */
-        void removeSelectionListener(gcn::SelectionListener *listener)
+        void removeSelectionListener(SelectionListener *listener)
         { mSelectionListeners.remove(listener); }
 
         void setFilter(const int tag);
@@ -187,11 +181,11 @@ class ItemContainer final : public gcn::Widget,
         ItemPopup *mItemPopup;
         int *mShowMatrix;
         Skin *mSkin;
-        gcn::Color mEquipedColor;
-        gcn::Color mEquipedColor2;
-        gcn::Color mUnEquipedColor;
-        gcn::Color mUnEquipedColor2;
-        typedef std::list<gcn::SelectionListener*> SelectionListenerList;
+        Color mEquipedColor;
+        Color mEquipedColor2;
+        Color mUnEquipedColor;
+        Color mUnEquipedColor2;
+        typedef std::list<SelectionListener*> SelectionListenerList;
         typedef SelectionListenerList::iterator SelectionListenerIterator;
         SelectionListenerList mSelectionListeners;
         int mGridColumns;
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index cb74a658b..2cf27ae30 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -35,25 +35,27 @@
 
 #include "resources/db/itemdb.h"
 
-#include <string>
+#include "listeners/actionlistener.h"
+
+#include "input/mouseinput.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/mouseinput.hpp>
+#include <string>
 
 #include "debug.h"
 
 namespace
 {
-    struct OpenUrlListener : public gcn::ActionListener
+    struct OpenUrlListener : public ActionListener
     {
         OpenUrlListener() :
+            ActionListener(),
             url()
         {
         }
 
         A_DELETE_COPY(OpenUrlListener)
 
-        void action(const gcn::ActionEvent &event) override final
+        void action(const ActionEvent &event) override final
         {
             if (event.getId() == "yes")
                 openBrowser(url);
@@ -64,6 +66,7 @@ namespace
 }  // namespace
 
 ItemLinkHandler::ItemLinkHandler() :
+    LinkHandler(),
     mItemPopup(new ItemPopup)
 {
     mItemPopup->postInit();
@@ -75,8 +78,7 @@ ItemLinkHandler::~ItemLinkHandler()
     mItemPopup = nullptr;
 }
 
-void ItemLinkHandler::handleLink(const std::string &link,
-                                 gcn::MouseEvent *event)
+void ItemLinkHandler::handleLink(const std::string &link, MouseEvent *event)
 {
     if (strStartWith(link, "http://") || strStartWith(link, "https://"))
     {
@@ -86,7 +88,7 @@ void ItemLinkHandler::handleLink(const std::string &link,
         replaceAll(url, " ", "");
         listener.url = url;
         const int button = event->getButton();
-        if (button == gcn::MouseInput::LEFT)
+        if (button == MouseInput::LEFT)
         {
             ConfirmDialog *const confirmDlg = new ConfirmDialog(
                 // TRANSLATORS: dialog message
@@ -94,7 +96,7 @@ void ItemLinkHandler::handleLink(const std::string &link,
             confirmDlg->postInit();
             confirmDlg->addActionListener(&listener);
         }
-        else if (button == gcn::MouseInput::RIGHT)
+        else if (button == MouseInput::RIGHT)
         {
             if (viewport)
                 viewport->showLinkPopup(url);
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 4e55a8f72..39e811721 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -39,7 +39,7 @@ class ItemLinkHandler final : public LinkHandler
         ~ItemLinkHandler();
 
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event) override final;
+                        MouseEvent *event) override final;
 
     private:
         ItemPopup *mItemPopup;
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index cdeb83af7..b9dc3bec8 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,6 +33,7 @@
 
 #include "input/inputmanager.h"
 
+#include "gui/font.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/itempopup.h"
@@ -45,12 +46,11 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
-ItemShortcutContainer::ItemShortcutContainer(const unsigned number) :
-    ShortcutContainer(),
+ItemShortcutContainer::ItemShortcutContainer(Widget2 *const widget,
+                                             const unsigned number) :
+    ShortcutContainer(widget),
     mItemClicked(false),
     mNumber(number),
     mItemPopup(new ItemPopup),
@@ -112,7 +112,7 @@ void ItemShortcutContainer::setWidget2(const Widget2 *const widget)
     mForegroundColor2 = getThemeColor(Theme::TEXT_OUTLINE);
 }
 
-void ItemShortcutContainer::draw(gcn::Graphics *graphics)
+void ItemShortcutContainer::draw(Graphics *graphics)
 {
     BLOCK_START("ItemShortcutContainer::draw")
     const ItemShortcut *const selShortcut = itemShortcut[mNumber];
@@ -129,9 +129,8 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
         mAlpha = client->getGuiAlpha();
     }
 
-    Graphics *const g = static_cast<Graphics*>(graphics);
-    gcn::Font *const font = getFont();
-    drawBackground(g);
+    Font *const font = getFont();
+    drawBackground(graphics);
 
     const Inventory *const inv = PlayerInfo::getInventory();
     if (!inv)
@@ -149,8 +148,8 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
         // Draw item keyboard shortcut.
         const std::string key = inputManager.getKeyValueString(
             Input::KEY_SHORTCUT_1 + i);
-        g->setColorAll(mForegroundColor, mForegroundColor);
-        font->drawString(g, key, itemX + 2, itemY + 2);
+        graphics->setColorAll(mForegroundColor, mForegroundColor);
+        font->drawString(graphics, key, itemX + 2, itemY + 2);
 
         const int itemId = selShortcut->getItem(i);
         const unsigned char itemColor = selShortcut->getItemColor(i);
@@ -175,12 +174,17 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
                     caption = "Eq.";
 
                     image->setAlpha(1.0F);
-                    g->drawImage2(image, itemX, itemY);
+                    graphics->drawImage(image, itemX, itemY);
                     if (item->isEquipped())
-                        g->setColorAll(mEquipedColor, mEquipedColor2);
+                    {
+                        graphics->setColorAll(mEquipedColor, mEquipedColor2);
+                    }
                     else
-                        g->setColorAll(mUnEquipedColor, mUnEquipedColor2);
-                    font->drawString(g, caption,
+                    {
+                        graphics->setColorAll(mUnEquipedColor,
+                            mUnEquipedColor2);
+                    }
+                    font->drawString(graphics, caption,
                         itemX + (mBoxWidth - font->getWidth(caption)) / 2,
                         itemY + mBoxHeight - 14);
                 }
@@ -199,11 +203,11 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
                     if (image)
                     {
                         image->setAlpha(1.0F);
-                        g->drawImage2(image, itemX, itemY);
+                        graphics->drawImage(image, itemX, itemY);
                     }
                 }
 
-                font->drawString(g, spell->getSymbol(),
+                font->drawString(graphics, spell->getSymbol(),
                     itemX + 2, itemY + mBoxHeight / 2);
             }
         }
@@ -218,10 +222,10 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
                 if (image)
                 {
                     image->setAlpha(1.0F);
-                    g->drawImage2(image, itemX, itemY);
+                    graphics->drawImage(image, itemX, itemY);
                 }
 
-                font->drawString(g, skill->data->shortName, itemX + 2,
+                font->drawString(graphics, skill->data->shortName, itemX + 2,
                     itemY + mBoxHeight / 2);
             }
         }
@@ -229,13 +233,13 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
     BLOCK_END("ItemShortcutContainer::draw")
 }
 
-void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseDragged(MouseEvent &event)
 {
     ItemShortcut *const selShortcut = itemShortcut[mNumber];
     if (!selShortcut)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (dragDrop.isEmpty() && mItemClicked)
         {
@@ -317,7 +321,7 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
+void ItemShortcutContainer::mousePressed(MouseEvent &event)
 {
     ItemShortcut *const selShortcut = itemShortcut[mNumber];
     if (!selShortcut)
@@ -328,7 +332,7 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
     if (index == -1)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         // Stores the selected item if theirs one.
         if (selShortcut->isItemSelected() && inventoryWindow &&
@@ -346,7 +350,7 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
             mItemClicked = true;
         }
     }
-    else if (event.getButton() == gcn::MouseEvent::RIGHT)
+    else if (event.getButton() == MouseEvent::RIGHT)
     {
         if (viewport && selShortcut)
         {
@@ -356,13 +360,13 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseReleased(MouseEvent &event)
 {
     ItemShortcut *const selShortcut = itemShortcut[mNumber];
     if (!selShortcut)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (selShortcut->isItemSelected())
             selShortcut->setItemSelected(-1);
@@ -398,7 +402,7 @@ void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
     }
 }
 
-void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseMoved(MouseEvent &event)
 {
     const ItemShortcut *const selShortcut = itemShortcut[mNumber];
     if (!selShortcut)
@@ -455,7 +459,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void ItemShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
@@ -463,7 +467,7 @@ void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
         mSpellPopup->setVisible(false);
 }
 
-void ItemShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void ItemShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index f9ec24589..07c3ef822 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -39,7 +39,8 @@ class ItemShortcutContainer final : public ShortcutContainer
         /**
          * Constructor. Initializes the graphic.
          */
-        explicit ItemShortcutContainer(const unsigned number);
+        ItemShortcutContainer(Widget2 *const widget,
+                              const unsigned number);
 
         A_DELETE_COPY(ItemShortcutContainer)
 
@@ -51,28 +52,28 @@ class ItemShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
         void setWidget2(const Widget2 *const widget);
 
@@ -82,10 +83,10 @@ class ItemShortcutContainer final : public ShortcutContainer
 
         ItemPopup *mItemPopup;
         SpellPopup *mSpellPopup;
-        gcn::Color mEquipedColor;
-        gcn::Color mEquipedColor2;
-        gcn::Color mUnEquipedColor;
-        gcn::Color mUnEquipedColor2;
+        Color mEquipedColor;
+        Color mEquipedColor2;
+        Color mUnEquipedColor;
+        Color mUnEquipedColor2;
 };
 
 #endif  // GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 7a16b800c..56c949964 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -21,7 +21,8 @@
 
 #include "gui/widgets/label.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "debug.h"
 
@@ -29,16 +30,15 @@ Skin *Label::mSkin = nullptr;
 int Label::mInstances = 0;
 
 Label::Label(const Widget2 *const widget) :
-    gcn::Label(),
-    Widget2(widget),
+    gcn::Label(widget),
     mPadding(0)
 {
     init();
 }
 
-Label::Label(const Widget2 *const widget, const std::string &caption) :
-    gcn::Label(caption),
-    Widget2(widget),
+Label::Label(const Widget2 *const widget,
+             const std::string &caption) :
+    gcn::Label(widget, caption),
     mPadding(0)
 {
     init();
@@ -76,13 +76,13 @@ void Label::init()
         mPadding = 0;
 }
 
-void Label::draw(gcn::Graphics* graphics)
+void Label::draw(Graphics* graphics)
 {
     BLOCK_START("Label::draw")
     int textX;
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     const int textY = rect.height / 2 - getFont()->getHeight() / 2;
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     switch (mAlignment)
     {
@@ -101,28 +101,27 @@ void Label::draw(gcn::Graphics* graphics)
             break;
     }
 
-    static_cast<Graphics*>(graphics)->setColorAll(
-        mForegroundColor, mForegroundColor2);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     font->drawString(graphics, mCaption, textX, textY);
     BLOCK_END("Label::draw")
 }
 
 void Label::adjustSize()
 {
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     const int pad2 = 2 * mPadding;
     setWidth(font->getWidth(mCaption) + pad2);
     setHeight(font->getHeight() + pad2);
 }
 
-void Label::setForegroundColor(const gcn::Color &color)
+void Label::setForegroundColor(const Color &color)
 {
     mForegroundColor = color;
     mForegroundColor2 = color;
 }
 
-void Label::setForegroundColorAll(const gcn::Color &color1,
-                                  const gcn::Color &color2)
+void Label::setForegroundColorAll(const Color &color1,
+                                  const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
@@ -130,7 +129,7 @@ void Label::setForegroundColorAll(const gcn::Color &color1,
 
 void Label::resizeTo(const int maxSize, const int minSize)
 {
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     const int pad2 = 2 * mPadding;
     setHeight(font->getHeight() + pad2);
 
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 3546f17b4..616f6cc79 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -22,9 +22,7 @@
 #ifndef GUI_WIDGETS_LABEL_H
 #define GUI_WIDGETS_LABEL_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/label.hpp>
+#include "gui/base/widgets/label.hpp"
 
 #include "localconsts.h"
 
@@ -36,7 +34,7 @@ class Skin;
  *
  * \ingroup GUI
  */
-class Label final : public gcn::Label, public Widget2
+class Label final : public gcn::Label
 {
     public:
         /**
@@ -48,7 +46,8 @@ class Label final : public gcn::Label, public Widget2
          * Constructor. This version of the constructor sets the label with an
          * inintialization string.
          */
-        Label(const Widget2 *const widget, const std::string &caption);
+        Label(const Widget2 *const widget,
+              const std::string &caption);
 
         A_DELETE_COPY(Label)
 
@@ -59,14 +58,14 @@ class Label final : public gcn::Label, public Widget2
         /**
          * Draws the label.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         void adjustSize();
 
-        void setForegroundColor(const gcn::Color &color);
+        void setForegroundColor(const Color &color);
 
-        void setForegroundColorAll(const gcn::Color &color1,
-                                   const gcn::Color &color2);
+        void setForegroundColorAll(const Color &color1,
+                                   const Color &color2);
 
         void resizeTo(const int maxSize, const int minSize);
 
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index d9a818e0f..24722510b 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -24,6 +24,8 @@
 
 #include "logger.h"
 
+#include "gui/base/widgets/container.hpp"
+
 #include <cassert>
 
 #include "debug.h"
@@ -34,7 +36,7 @@ ContainerPlacer ContainerPlacer::at(const int x, const int y)
 }
 
 LayoutCell &ContainerPlacer::operator()
-    (const int x, const int y, gcn::Widget *const wg, const int w, const int h)
+    (const int x, const int y, Widget *const wg, const int w, const int h)
 {
     mContainer->add(wg);
     return mCell->place(wg, x, y, w, h);
@@ -78,7 +80,7 @@ void LayoutCell::reflow(int nx, int ny, int nw, int nh)
     if (mType == ARRAY)
         mArray->reflow(nx, ny, nw, nh);
     else
-        mWidget->setDimension(gcn::Rectangle(nx, ny, nw, nh));
+        mWidget->setDimension(Rect(nx, ny, nw, nh));
 }
 
 void LayoutCell::computeSizes()
@@ -201,7 +203,7 @@ void LayoutArray::extend(const int x, const int y, const int w, const int h)
     cell.mExtent[1] = h;
 }
 
-LayoutCell &LayoutArray::place(gcn::Widget *const widget, const int x,
+LayoutCell &LayoutArray::place(Widget *const widget, const int x,
                                const int y, const int w, const int h)
 {
     LayoutCell &cell = at(x, y, w, h);
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index b03c10c1f..288c282a0 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -25,12 +25,17 @@
 
 #include "localconsts.h"
 
-#include <guichan/widgets/container.hpp>
-
 #include <vector>
 
 class LayoutCell;
 
+namespace gcn
+{
+    class Container;
+}
+
+class Widget;
+
 /**
  * This class is a helper for adding widgets to nested tables in a window.
  */
@@ -57,7 +62,7 @@ class ContainerPlacer final
          * Adds the given widget to the container and places it in the layout.
          * @see LayoutArray::place
          */
-        LayoutCell &operator()(const int x, const int y, gcn::Widget *const wg,
+        LayoutCell &operator()(const int x, const int y, Widget *const wg,
             const int w = 1, const int h = 1);
 
     private:
@@ -90,7 +95,7 @@ class LayoutArray final
          * @note When @a w is 1, the width of column @a x is reset to zero if
          *       it was AUTO_DEF. Similarly for @a h.
          */
-        LayoutCell &place(gcn::Widget *const widget, const int x, const int y,
+        LayoutCell &place(Widget *const widget, const int x, const int y,
                           const int w = 1, const int h = 1);
 
         /**
@@ -216,7 +221,7 @@ class LayoutCell
         /**
          * @see LayoutArray::place
          */
-        LayoutCell &place(gcn::Widget *wg, int x, int y, int w = 1, int h = 1)
+        LayoutCell &place(Widget *wg, int x, int y, int w = 1, int h = 1)
         { return getArray().place(wg, x, y, w, h); }
 
         /**
@@ -294,7 +299,7 @@ class LayoutCell
 
         union
         {
-            gcn::Widget *mWidget;
+            Widget *mWidget;
             LayoutArray *mArray;
         };
 
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index b0fb75adc..c225c7543 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -22,10 +22,12 @@
 
 #include "gui/widgets/layouthelper.h"
 
+#include "gui/base/widgets/container.hpp"
+
 #include "debug.h"
 
 LayoutHelper::LayoutHelper(gcn::Container *const container) :
-    gcn::WidgetListener(),
+    WidgetListener(),
     mLayout(),
     mContainer(container)
 {
@@ -43,7 +45,7 @@ const Layout &LayoutHelper::getLayout() const
 }
 
 LayoutCell &LayoutHelper::place(const int x, const int y,
-                                gcn::Widget *const wg,
+                                Widget *const wg,
                                 const int w, const int h)
 {
     mContainer->add(wg);
@@ -61,9 +63,9 @@ void LayoutHelper::reflowLayout(int w, int h)
     mContainer->setSize(w, h);
 }
 
-void LayoutHelper::widgetResized(const gcn::Event &event A_UNUSED)
+void LayoutHelper::widgetResized(const Event &event A_UNUSED)
 {
-    const gcn::Rectangle area = mContainer->getChildrenArea();
+    const Rect area = mContainer->getChildrenArea();
     int w = area.width;
     int h = area.height;
     mLayout.reflow(w, h);
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 4f8ed8708..32e3d9e34 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -25,14 +25,14 @@
 
 #include "gui/widgets/layout.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 /**
  * A helper class for adding a layout to a Guichan container widget. The layout
  * will register itself as a widget listener and relayout the widgets in the
  * container dynamically on resize.
  */
-class LayoutHelper final : public gcn::WidgetListener
+class LayoutHelper final : public WidgetListener
 {
     public:
         /**
@@ -67,7 +67,7 @@ class LayoutHelper final : public gcn::WidgetListener
         /**
          * Adds a widget to the container and sets it at given cell.
          */
-        LayoutCell &place(const int x, const int y, gcn::Widget *const wg,
+        LayoutCell &place(const int x, const int y, Widget *const wg,
                           const int w = 1, const int h = 1);
 
         /**
@@ -78,7 +78,7 @@ class LayoutHelper final : public gcn::WidgetListener
         /**
          * Called whenever the managed container changes size.
          */
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     private:
         Layout mLayout;              /**< Layout handler */
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index 744ff0b29..b373162a3 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include <guichan/mouselistener.hpp>
+#include "listeners/mouselistener.h"
 
 /**
  * A simple interface to windows that need to handle links from BrowserBox
@@ -38,7 +38,7 @@ class LinkHandler
         { }
 
         virtual void handleLink(const std::string &link,
-                                gcn::MouseEvent *event) = 0;
+                                MouseEvent *event) = 0;
 };
 
 #endif  // GUI_WIDGETS_LINKHANDLER_H
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 9a1a074b3..c6e431634 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -24,25 +24,26 @@
 
 #include "client.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
+#include "gui/focushandler.h"
+#include "gui/font.h"
 #include "gui/gui.h"
 
-#include <guichan/focushandler.hpp>
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
+
+#include "render/graphics.h"
 
 #include "debug.h"
 
 float ListBox::mAlpha = 1.0;
 
 ListBox::ListBox(const Widget2 *const widget,
-                 gcn::ListModel *const listModel,
+                 ListModel *const listModel,
                  const std::string &skin) :
-    gcn::ListBox(listModel),
-    Widget2(widget),
+    gcn::ListBox(widget, listModel),
     mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
     mForegroundSelectedColor(getThemeColor(Theme::LISTBOX_SELECTED)),
     mForegroundSelectedColor2(getThemeColor(Theme::LISTBOX_SELECTED_OUTLINE)),
@@ -68,7 +69,7 @@ ListBox::ListBox(const Widget2 *const widget,
         mItemPadding = mSkin->getOption("itemPadding");
     }
 
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     if (font)
         mRowHeight = font->getHeight() + 2 * mItemPadding;
     else
@@ -98,18 +99,17 @@ void ListBox::updateAlpha()
         mAlpha = alpha;
 }
 
-void ListBox::draw(gcn::Graphics *graphics)
+void ListBox::draw(Graphics *graphics)
 {
     if (!mListModel)
         return;
 
     BLOCK_START("ListBox::draw")
     updateAlpha();
-    Graphics *const g = static_cast<Graphics*>(graphics);
 
     mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
     graphics->setColor(mHighlightColor);
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     const int rowHeight = getRowHeight();
     const int width = mDimension.width;
 
@@ -118,11 +118,11 @@ void ListBox::draw(gcn::Graphics *graphics)
         // Draw filled rectangle around the selected list element
         if (mSelected >= 0)
         {
-            graphics->fillRectangle(gcn::Rectangle(mPadding,
+            graphics->fillRectangle(Rect(mPadding,
                 rowHeight * mSelected + mPadding,
                 mDimension.width - 2 * mPadding, rowHeight));
 
-            g->setColorAll(mForegroundSelectedColor,
+            graphics->setColorAll(mForegroundSelectedColor,
                 mForegroundSelectedColor2);
             const std::string str = mListModel->getElementAt(mSelected);
             font->drawString(graphics, str,
@@ -130,7 +130,7 @@ void ListBox::draw(gcn::Graphics *graphics)
                 mSelected * rowHeight + mPadding + mItemPadding);
         }
         // Draw the list elements
-        g->setColorAll(mForegroundColor, mForegroundColor2);
+        graphics->setColorAll(mForegroundColor, mForegroundColor2);
         const int sz = mListModel->getNumberOfElements();
         for (int i = 0, y = mPadding + mItemPadding;
              i < sz; ++i, y += rowHeight)
@@ -148,18 +148,18 @@ void ListBox::draw(gcn::Graphics *graphics)
         // Draw filled rectangle around the selected list element
         if (mSelected >= 0)
         {
-            graphics->fillRectangle(gcn::Rectangle(mPadding,
+            graphics->fillRectangle(Rect(mPadding,
                 rowHeight * mSelected + mPadding,
                 mDimension.width - 2 * mPadding, rowHeight));
 
-            g->setColorAll(mForegroundSelectedColor,
+            graphics->setColorAll(mForegroundSelectedColor,
                 mForegroundSelectedColor2);
             const std::string str = mListModel->getElementAt(mSelected);
             font->drawString(graphics, str, mPadding,
                 mSelected * rowHeight + mPadding + mItemPadding);
         }
         // Draw the list elements
-        g->setColorAll(mForegroundColor, mForegroundColor2);
+        graphics->setColorAll(mForegroundColor, mForegroundColor2);
         const int sz = mListModel->getNumberOfElements();
         for (int i = 0, y = mPadding + mItemPadding; i < sz;
              ++i, y += rowHeight)
@@ -174,9 +174,9 @@ void ListBox::draw(gcn::Graphics *graphics)
     BLOCK_END("ListBox::draw")
 }
 
-void ListBox::keyPressed(gcn::KeyEvent &keyEvent)
+void ListBox::keyPressed(KeyEvent &keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
     if (action == Input::KEY_GUI_SELECT)
     {
         distributeActionEvent();
@@ -213,20 +213,20 @@ void ListBox::keyPressed(gcn::KeyEvent &keyEvent)
 
 // Don't do anything on scrollwheel. ScrollArea will deal with that.
 
-void ListBox::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent A_UNUSED)
+void ListBox::mouseWheelMovedUp(MouseEvent &mouseEvent A_UNUSED)
 {
 }
 
-void ListBox::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent A_UNUSED)
+void ListBox::mouseWheelMovedDown(MouseEvent &mouseEvent A_UNUSED)
 {
 }
 
-void ListBox::mousePressed(gcn::MouseEvent &event)
+void ListBox::mousePressed(MouseEvent &event)
 {
     mPressedIndex = getSelectionByMouse(event.getY());
 }
 
-void ListBox::mouseReleased(gcn::MouseEvent &event)
+void ListBox::mouseReleased(MouseEvent &event)
 {
     if (mPressedIndex != getSelectionByMouse(event.getY()))
         return;
@@ -261,18 +261,18 @@ void ListBox::mouseReleased(gcn::MouseEvent &event)
     mPressedIndex = -2;
 }
 
-void ListBox::mouseReleased1(const gcn::MouseEvent &mouseEvent)
+void ListBox::mouseReleased1(const MouseEvent &mouseEvent)
 {
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
     {
         setSelected(std::max(0, getSelectionByMouse(mouseEvent.getY())));
         distributeActionEvent();
     }
 }
 
-void ListBox::mouseDragged(gcn::MouseEvent &event)
+void ListBox::mouseDragged(MouseEvent &event)
 {
-    if (event.getButton() != gcn::MouseEvent::LEFT || getRowHeight() == 0)
+    if (event.getButton() != MouseEvent::LEFT || getRowHeight() == 0)
         return;
 
     // Make list selection update on drag, but guard against negative y
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index b1a2f0da5..64faa6eb5 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -23,13 +23,17 @@
 #ifndef GUI_WIDGETS_LISTBOX_H
 #define GUI_WIDGETS_LISTBOX_H
 
-#include "gui/widgets/widget2.h"
+#include "gui/color.h"
 
-#include <guichan/widgets/listbox.hpp>
+#include "gui/base/widgets/listbox.hpp"
 
 #include "localconsts.h"
 
 class Skin;
+class KeyEvent;
+class ListModel;
+class MouseEvent;
+class Widget2;
 
 /**
  * A list box, meant to be used inside a scroll area. Same as the Guichan list
@@ -38,15 +42,14 @@ class Skin;
  *
  * \ingroup GUI
  */
-class ListBox : public gcn::ListBox,
-                public Widget2
+class ListBox : public gcn::ListBox
 {
     public:
         /**
          * Constructor.
          */
         ListBox(const Widget2 *const widget,
-                gcn::ListModel *const listModel,
+                ListModel *const listModel,
                 const std::string &skin);
 
         A_DELETE_COPY(ListBox)
@@ -58,7 +61,7 @@ class ListBox : public gcn::ListBox,
         /**
          * Draws the list box.
          */
-        void draw(gcn::Graphics *graphics) override;
+        void draw(Graphics *graphics) override;
 
         /**
          * Update the alpha value to the graphic components.
@@ -67,21 +70,21 @@ class ListBox : public gcn::ListBox,
 
         // Inherited from KeyListener
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
         // Inherited from MouseListener
 
-        void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
+        void mouseWheelMovedUp(MouseEvent& mouseEvent) override final;
 
-        void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
+        void mouseWheelMovedDown(MouseEvent& mouseEvent) override final;
 
-        void mousePressed(gcn::MouseEvent &event) override;
+        void mousePressed(MouseEvent &event) override;
 
-        void mouseReleased(gcn::MouseEvent &event) override;
+        void mouseReleased(MouseEvent &event) override;
 
-        void mouseReleased1(const gcn::MouseEvent &event);
+        void mouseReleased1(const MouseEvent &event);
 
-        void mouseDragged(gcn::MouseEvent &event) override;
+        void mouseDragged(MouseEvent &event) override;
 
         void refocus();
 
@@ -107,9 +110,9 @@ class ListBox : public gcn::ListBox,
         { mRowHeight = n; }
 
     protected:
-        gcn::Color mHighlightColor;
-        gcn::Color mForegroundSelectedColor;
-        gcn::Color mForegroundSelectedColor2;
+        Color mHighlightColor;
+        Color mForegroundSelectedColor;
+        Color mForegroundSelectedColor2;
         int mOldSelected;
         int mPadding;
         int mPressedIndex;
diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index b2ee6ccad..1b562b7f0 100644
--- a/src/gui/widgets/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
@@ -31,7 +31,7 @@ PasswordField::PasswordField(const Widget2 *const widget,
 {
 }
 
-void PasswordField::draw(gcn::Graphics *graphics)
+void PasswordField::draw(Graphics *graphics)
 {
     BLOCK_START("PasswordField::draw")
     // std::string uses cow, thus cheap copy
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 322d71b8b..f72350763 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -44,7 +44,7 @@ class PasswordField final : public TextField
         /**
          * Draws the password field.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
     protected:
         int mPasswordChar;
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 6fda932bf..7ef543511 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -26,14 +26,17 @@
 
 #include "being/being.h"
 
+#include "gui/gui.h"
+
 #include "resources/image.h"
 
 #include "debug.h"
 
-PlayerBox::PlayerBox(Being *const being, const std::string &skin,
+PlayerBox::PlayerBox(Widget2 *const widget,
+                     Being *const being,
+                     const std::string &skin,
                      const std::string &selectedSkin) :
-    Widget2(),
-    ScrollArea(),
+    ScrollArea(widget),
     mBeing(being),
     mAlpha(1.0),
     mBackground(),
@@ -48,9 +51,10 @@ PlayerBox::PlayerBox(Being *const being, const std::string &skin,
     init(skin, selectedSkin);
 }
 
-PlayerBox::PlayerBox(const std::string &skin,
+PlayerBox::PlayerBox(Widget2 *const widget,
+                     const std::string &skin,
                      const std::string &selectedSkin) :
-    ScrollArea(),
+    ScrollArea(widget),
     mBeing(nullptr),
     mAlpha(1.0),
     mBackground(),
@@ -107,7 +111,7 @@ void PlayerBox::init(std::string name, std::string selectedName)
     }
 }
 
-void PlayerBox::draw(gcn::Graphics *graphics)
+void PlayerBox::draw(Graphics *graphics)
 {
     BLOCK_START("PlayerBox::draw")
     if (mBeing)
@@ -115,7 +119,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
         const int bs = mFrameSize;
         const int x = mDimension.width / 2 + bs + mOffsetX;
         const int y = mDimension.height - bs + mOffsetY;
-        mBeing->drawSpriteAt(static_cast<Graphics*>(graphics), x, y);
+        mBeing->drawSpriteAt(graphics, x, y);
     }
 
     if (client->getGuiAlpha() != mAlpha)
@@ -130,7 +134,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
     BLOCK_END("PlayerBox::draw")
 }
 
-void PlayerBox::drawFrame(gcn::Graphics *graphics)
+void PlayerBox::drawFrame(Graphics *graphics)
 {
     BLOCK_START("PlayerBox::drawFrame")
     if (mDrawBackground)
@@ -140,23 +144,17 @@ void PlayerBox::drawFrame(gcn::Graphics *graphics)
         const int h = mDimension.height + bs;
 
         if (!mSelected)
-        {
-            static_cast<Graphics*>(graphics)->drawImageRect(
-                0, 0, w, h, mBackground);
-        }
+            graphics->drawImageRect(0, 0, w, h, mBackground);
         else
-        {
-            static_cast<Graphics*>(graphics)->drawImageRect(
-                0, 0, w, h, mSelectedBackground);
-        }
+            graphics->drawImageRect(0, 0, w, h, mSelectedBackground);
     }
     BLOCK_END("PlayerBox::drawFrame")
 }
 
-void PlayerBox::mouseReleased(gcn::MouseEvent& event)
+void PlayerBox::mouseReleased(MouseEvent& event)
 {
     ScrollArea::mouseReleased(event);
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (!mActionEventId.empty())
             distributeActionEvent();
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 3ebae9be4..7481dc9db 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -23,9 +23,7 @@
 #ifndef GUI_WIDGETS_PLAYERBOX_H
 #define GUI_WIDGETS_PLAYERBOX_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/scrollarea.hpp>
+#include "gui/base/widgets/scrollarea.hpp"
 
 #include "localconsts.h"
 
@@ -37,18 +35,20 @@ class Skin;
  *
  * \ingroup GUI
  */
-class PlayerBox final : public Widget2,
-                        public gcn::ScrollArea
+class PlayerBox final : public gcn::ScrollArea
 {
     public:
         /**
          * Constructor. Takes the initial player character that this box should
          * display, which defaults to <code>NULL</code>.
          */
-        explicit PlayerBox(Being *const being, const std::string &skin = "",
+        explicit PlayerBox(Widget2 *const widget,
+                           Being *const being,
+                           const std::string &skin = "",
                            const std::string &selectedSkin = "");
 
-        explicit PlayerBox(const std::string &skin = "",
+        explicit PlayerBox(Widget2 *const widget,
+                           const std::string &skin = "",
                            const std::string &selectedSkin = "");
 
         A_DELETE_COPY(PlayerBox)
@@ -71,12 +71,12 @@ class PlayerBox final : public Widget2,
         /**
          * Draws the scroll area.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Draws the background and border of the scroll area.
          */
-        void drawFrame(gcn::Graphics *graphics) override final;
+        void drawFrame(Graphics *graphics) override final;
 
         Being *getBeing() A_WARN_UNUSED
         { return mBeing; }
@@ -84,7 +84,7 @@ class PlayerBox final : public Widget2,
         void setSelected(bool b)
         { mSelected = b; }
 
-        void mouseReleased(gcn::MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) override final;
 
     private:
         Being *mBeing;
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 1ba4083cd..1114b4a5e 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -27,15 +27,13 @@
 
 #include "gui/viewport.h"
 
-#include <guichan/exception.hpp>
-
 #include "debug.h"
 
 Popup::Popup(const std::string &name,
              std::string skin) :
     Container(nullptr),
-    gcn::MouseListener(),
-    gcn::WidgetListener(),
+    MouseListener(),
+    WidgetListener(),
     mPadding(3),
     mSkin(nullptr),
     mPopupName(name),
@@ -48,9 +46,6 @@ Popup::Popup(const std::string &name,
 {
     logger->log("Popup::Popup(\"%s\")", name.c_str());
 
-    if (!windowContainer)
-        throw GCN_EXCEPTION("Popup::Popup(): no windowContainer set");
-
     addWidgetListener(this);
 
     if (skin == "")
@@ -67,7 +62,8 @@ Popup::Popup(const std::string &name,
         }
     }
 
-    windowContainer->add(this);
+    if (windowContainer)
+        windowContainer->add(this);
 
     // Popups are invisible by default
     setVisible(false);
@@ -94,10 +90,9 @@ void Popup::setWindowContainer(WindowContainer *const wc)
     windowContainer = wc;
 }
 
-void Popup::draw(gcn::Graphics *graphics)
+void Popup::draw(Graphics *graphics)
 {
     BLOCK_START("Popup::draw")
-    Graphics *const g = static_cast<Graphics*>(graphics);
 
     if (mSkin)
     {
@@ -107,16 +102,18 @@ void Popup::draw(gcn::Graphics *graphics)
             {
                 mRedraw = false;
                 mVertexes->clear();
-                g->calcWindow(mVertexes, 0, 0,
+                graphics->calcWindow(mVertexes,
+                    0, 0,
                     mDimension.width, mDimension.height,
                     mSkin->getBorder());
             }
 
-            g->drawTileCollection(mVertexes);
+            graphics->drawTileCollection(mVertexes);
         }
         else
         {
-            g->drawImageRect(0, 0, mDimension.width, mDimension.height,
+            graphics->drawImageRect(0, 0,
+                mDimension.width, mDimension.height,
                 mSkin->getBorder());
         }
     }
@@ -125,10 +122,10 @@ void Popup::draw(gcn::Graphics *graphics)
     BLOCK_END("Popup::draw")
 }
 
-gcn::Rectangle Popup::getChildrenArea()
+Rect Popup::getChildrenArea()
 {
     const int pad2 = mPadding * 2;
-    return gcn::Rectangle(mPadding, mPadding,
+    return Rect(mPadding, mPadding,
         mDimension.width - pad2, mDimension.height - pad2);
 }
 
@@ -151,7 +148,7 @@ void Popup::setContentSize(int width, int height)
     mRedraw = true;
 }
 
-void Popup::setLocationRelativeTo(const gcn::Widget *const widget)
+void Popup::setLocationRelativeTo(const Widget *const widget)
 {
     if (!widget)
         return;
@@ -230,7 +227,7 @@ void Popup::position(const int x, const int y)
     mRedraw = true;
 }
 
-void Popup::mouseMoved(gcn::MouseEvent &event A_UNUSED)
+void Popup::mouseMoved(MouseEvent &event A_UNUSED)
 {
     if (viewport)
         viewport->hideBeingPopup();
@@ -243,12 +240,12 @@ void Popup::hide()
     mRedraw = true;
 }
 
-void Popup::widgetResized(const gcn::Event &event A_UNUSED)
+void Popup::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Popup::widgetMoved(const gcn::Event &event A_UNUSED)
+void Popup::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 711ac97b7..01247cf61 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -26,8 +26,8 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
 
 class ImageCollection;
 class Skin;
@@ -45,8 +45,9 @@ class WindowContainer;
  *
  * \ingroup GUI
  */
-class Popup : public Container, public gcn::MouseListener,
-              public gcn::WidgetListener
+class Popup : public Container,
+              public MouseListener,
+              public WidgetListener
 {
     public:
         /**
@@ -75,7 +76,7 @@ class Popup : public Container, public gcn::MouseListener,
         /**
          * Draws the popup.
          */
-        void draw(gcn::Graphics *graphics) override;
+        void draw(Graphics *graphics) override;
 
         /**
          * Sets the size of this popup.
@@ -85,9 +86,9 @@ class Popup : public Container, public gcn::MouseListener,
         /**
          * Sets the location relative to the given widget.
          */
-        void setLocationRelativeTo(const gcn::Widget *const widget);
+        void setLocationRelativeTo(const Widget *const widget);
 
-        void mouseMoved(gcn::MouseEvent &event) override;
+        void mouseMoved(MouseEvent &event) override;
 
         /**
          * Sets the minimum width of the popup.
@@ -151,7 +152,7 @@ class Popup : public Container, public gcn::MouseListener,
 
         // Inherited from BasicContainer
 
-        virtual gcn::Rectangle getChildrenArea() override;
+        virtual Rect getChildrenArea() override;
 
         /**
          * Sets the location to display the popup. Tries to horizontally center
@@ -163,9 +164,9 @@ class Popup : public Container, public gcn::MouseListener,
 
         void hide();
 
-        void widgetResized(const gcn::Event &event) override;
+        void widgetResized(const Event &event) override;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         bool isPopupVisible() const
         { return mVisible; }
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index f7f8afc66..cfb973384 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -29,15 +29,15 @@
 #include "debug.h"
 
 PopupList::PopupList(DropDown *const widget,
-                     gcn::ListModel *const listModel,
+                     ListModel *const listModel,
                      bool extended, bool modal):
     Popup("PopupList", "popuplist.xml"),
-    gcn::FocusListener(),
+    FocusListener(),
     mListModel(listModel),
     mListBox(extended ? new ExtendedListBox(
         widget, listModel, "extendedlistbox.xml", 0) :
         new ListBox(widget, listModel, "popuplistbox.xml")),
-    mScrollArea(new ScrollArea(mListBox, false)),
+    mScrollArea(new ScrollArea(this, mListBox, false)),
     mDropDown(widget),
     mPressedIndex(-2),
     mModal(modal)
@@ -90,7 +90,7 @@ void PopupList::show(int x, int y)
         requestModalFocus();
 }
 
-void PopupList::widgetResized(const gcn::Event &event)
+void PopupList::widgetResized(const Event &event)
 {
     Popup::widgetResized(event);
     adjustSize();
@@ -112,7 +112,7 @@ int PopupList::getSelected() const
     return mListBox->getSelected();
 }
 
-void PopupList::setListModel(gcn::ListModel *const model)
+void PopupList::setListModel(ListModel *const model)
 {
     if (mListBox)
         mListBox->setListModel(model);
@@ -129,13 +129,13 @@ void PopupList::adjustSize()
     mListBox->setWidth(width);
 }
 
-void PopupList::mousePressed(gcn::MouseEvent& mouseEvent)
+void PopupList::mousePressed(MouseEvent& mouseEvent)
 {
     mPressedIndex = mListBox->getSelectionByMouse(
         mouseEvent.getY() + mPadding);
 }
 
-void PopupList::mouseReleased(gcn::MouseEvent& mouseEvent)
+void PopupList::mouseReleased(MouseEvent& mouseEvent)
 {
     if (mPressedIndex != mListBox->getSelectionByMouse(
         mouseEvent.getY() + mPadding))
@@ -154,9 +154,9 @@ void PopupList::mouseReleased(gcn::MouseEvent& mouseEvent)
         releaseModalFocus();
 }
 
-void PopupList::focusGained(const gcn::Event& event)
+void PopupList::focusGained(const Event& event)
 {
-    const gcn::Widget *const source = event.getSource();
+    const Widget *const source = event.getSource();
     if (!mVisible || source == this || source == mListBox
         || source == mScrollArea || source == mDropDown)
     {
@@ -170,7 +170,7 @@ void PopupList::focusGained(const gcn::Event& event)
         releaseModalFocus();
 }
 
-void PopupList::focusLost(const gcn::Event& event A_UNUSED)
+void PopupList::focusLost(const Event& event A_UNUSED)
 {
     if (mDropDown)
         mDropDown->updateSelection();
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index f41b9f631..32a9dfc47 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -23,21 +23,21 @@
 
 #include "gui/widgets/popup.h"
 
-#include <guichan/focuslistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "listeners/focuslistener.h"
 
 #include "localconsts.h"
 
 class DropDown;
 class ListBox;
+class ListModel;
 class ScrollArea;
 
 class PopupList final : public Popup,
-                        public gcn::FocusListener
+                        public FocusListener
 {
     public:
         PopupList(DropDown *const widget,
-                  gcn::ListModel *const listModel, bool extended,
+                  ListModel *const listModel, bool extended,
                   bool modal = false);
 
         ~PopupList();
@@ -48,29 +48,29 @@ class PopupList final : public Popup,
 
         void show(int x, int y);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void setSelected(int selected);
 
         int getSelected() const;
 
-        void setListModel(gcn::ListModel *const model);
+        void setListModel(ListModel *const model);
 
-        gcn::ListModel *getListModel() const
+        ListModel *getListModel() const
         { return mListModel; }
 
         void adjustSize();
 
-        void focusGained(const gcn::Event& event A_UNUSED) override final;
+        void focusGained(const Event& event A_UNUSED) override final;
 
-        void focusLost(const gcn::Event& event A_UNUSED) override final;
+        void focusLost(const Event& event A_UNUSED) override final;
 
-        void mousePressed(gcn::MouseEvent& mouseEvent) override final;
+        void mousePressed(MouseEvent& mouseEvent) override final;
 
-        void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
+        void mouseReleased(MouseEvent& mouseEvent) override final;
 
     private:
-        gcn::ListModel *mListModel;
+        ListModel *mListModel;
         ListBox *mListBox;
         ScrollArea *mScrollArea;
         DropDown *mDropDown;
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 38257e0a8..5bccd61ca 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -25,23 +25,23 @@
 #include "client.h"
 #include "graphicsvertexes.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
-
-#include <guichan/font.hpp>
 
 #include "debug.h"
 
 int ProgressBar::mInstances = 0;
 float ProgressBar::mAlpha = 1.0;
 
-ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
-                         const int width, const int height,
+ProgressBar::ProgressBar(const Widget2 *const widget,
+                         float progress,
+                         const int width,
+                         const int height,
                          const int backColor,
-                         const std::string &skin, const std::string &skinFill):
-    gcn::Widget(),
-    Widget2(widget),
-    gcn::WidgetListener(),
+                         const std::string &skin,
+                         const std::string &skinFill):
+    Widget(widget),
+    WidgetListener(),
     mFillRect(),
     mSkin(nullptr),
     mProgress(progress),
@@ -146,12 +146,12 @@ void ProgressBar::updateAlpha()
     mAlpha = alpha;
 }
 
-void ProgressBar::draw(gcn::Graphics *graphics)
+void ProgressBar::draw(Graphics *graphics)
 {
     BLOCK_START("ProgressBar::draw")
     updateAlpha();
     mBackgroundColor.a = static_cast<int>(mAlpha * 255);
-    render(static_cast<Graphics*>(graphics));
+    render(graphics);
     BLOCK_END("ProgressBar::draw")
 }
 
@@ -184,7 +184,7 @@ void ProgressBar::setProgressPalette(const int progressPalette)
     }
 }
 
-void ProgressBar::setBackgroundColor(const gcn::Color &color)
+void ProgressBar::setBackgroundColor(const Color &color)
 {
     mRedraw = true;
     mBackgroundColorToGo = color;
@@ -193,7 +193,7 @@ void ProgressBar::setBackgroundColor(const gcn::Color &color)
         mBackgroundColor = color;
 }
 
-void ProgressBar::setColor(const gcn::Color &color1, const gcn::Color &color2)
+void ProgressBar::setColor(const Color &color1, const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
@@ -261,7 +261,7 @@ void ProgressBar::render(Graphics *graphics)
         {
             if (width > maxWidth)
                 width = maxWidth;
-            graphics->fillRectangle(gcn::Rectangle(mFillPadding, mFillPadding,
+            graphics->fillRectangle(Rect(mFillPadding, mFillPadding,
                 width, mDimension.height - pad));
         }
     }
@@ -269,9 +269,9 @@ void ProgressBar::render(Graphics *graphics)
     // The label
     if (!mText.empty())
     {
-        const gcn::Color oldColor = graphics->getColor();
+        const Color oldColor = graphics->getColor();
 
-        gcn::Font *const font = gui->getFont();
+        Font *const font = gui->getFont();
         const int textX = mDimension.width / 2;
         const int textY = (mDimension.height - font->getHeight()) / 2;
 
@@ -283,12 +283,12 @@ void ProgressBar::render(Graphics *graphics)
     }
 }
 
-void ProgressBar::widgetResized(const gcn::Event &event A_UNUSED)
+void ProgressBar::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void ProgressBar::widgetMoved(const gcn::Event &event A_UNUSED)
+void ProgressBar::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index eefabe83a..fef9bf11d 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -23,10 +23,9 @@
 #ifndef GUI_WIDGETS_PROGRESSBAR_H
 #define GUI_WIDGETS_PROGRESSBAR_H
 
-#include "gui/widgets/widget2.h"
+#include "gui/widgets/widget.h"
 
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include <string>
 
@@ -40,18 +39,20 @@ class Skin;
  *
  * \ingroup GUI
  */
-class ProgressBar final : public gcn::Widget,
-                          public Widget2,
-                          public gcn::WidgetListener
+class ProgressBar final : public Widget,
+                          public WidgetListener
 {
     public:
         /**
          * Constructor, initializes the progress with the given value.
          */
-        ProgressBar(const Widget2 *const widget, float progress,
-                    const int width, const int height,
+        ProgressBar(const Widget2 *const widget,
+                    float progress,
+                    const int width,
+                    const int height,
                     const int backColor,
-                    const std::string &skin, const std::string &skinFill);
+                    const std::string &skin,
+                    const std::string &skinFill);
 
         A_DELETE_COPY(ProgressBar)
 
@@ -70,7 +71,7 @@ class ProgressBar final : public gcn::Widget,
         /**
          * Draws the progress bar.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Sets the current progress.
@@ -92,14 +93,14 @@ class ProgressBar final : public gcn::Widget,
         /**
          * Change the color of the progress bar.
          */
-        void setBackgroundColor(const gcn::Color &color);
+        void setBackgroundColor(const Color &color);
 
-        void setColor(const gcn::Color &color1, const gcn::Color &color2);
+        void setColor(const Color &color1, const Color &color2);
 
         /**
          * Returns the color of the progress bar.
          */
-        const gcn::Color &getBackgroundColor() const A_WARN_UNUSED
+        const Color &getBackgroundColor() const A_WARN_UNUSED
         { return mBackgroundColor; }
 
         /**
@@ -131,9 +132,9 @@ class ProgressBar final : public gcn::Widget,
          */
         void render(Graphics *graphics);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         void setPadding(unsigned int padding)
         { mPadding = padding; }
@@ -144,7 +145,7 @@ class ProgressBar final : public gcn::Widget,
         float mProgress;
         float mProgressToGo;
 
-        gcn::Color mBackgroundColorToGo;
+        Color mBackgroundColorToGo;
 
         std::string mText;
         ImageCollection *mVertexes;
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index d89ff7f2a..8e86417bd 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -23,14 +23,15 @@
 
 #include "simpleanimation.h"
 
+#include "gui/gui.h"
+
 #include "resources/animation.h"
 #include "resources/imageset.h"
 
 #include "debug.h"
 
-ProgressIndicator::ProgressIndicator() :
-    gcn::Widget(),
-    Widget2(),
+ProgressIndicator::ProgressIndicator(Widget2 *const widget) :
+    Widget(widget),
     mIndicator(nullptr)
 {
     ImageSet *const images = Theme::getImageSetFromTheme(
@@ -65,7 +66,7 @@ void ProgressIndicator::logic()
     BLOCK_END("ProgressIndicator::logic")
 }
 
-void ProgressIndicator::draw(gcn::Graphics *graphics)
+void ProgressIndicator::draw(Graphics *graphics)
 {
     BLOCK_START("ProgressIndicator::draw")
     if (mIndicator)
@@ -73,7 +74,7 @@ void ProgressIndicator::draw(gcn::Graphics *graphics)
         // Draw the indicator centered on the widget
         const int x = (mDimension.width - 32) / 2;
         const int y = (mDimension.height - 32) / 2;
-        mIndicator->draw(static_cast<Graphics*>(graphics), x, y);
+        mIndicator->draw(graphics, x, y);
     }
     BLOCK_END("ProgressIndicator::draw")
 }
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 61a72dd67..447c3d4e4 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -22,9 +22,7 @@
 #ifndef GUI_WIDGETS_PROGRESSINDICATOR_H
 #define GUI_WIDGETS_PROGRESSINDICATOR_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widget.hpp>
+#include "gui/widgets/widget.h"
 
 #include "localconsts.h"
 
@@ -34,11 +32,10 @@ class SimpleAnimation;
  * A widget that indicates progress. Suitable to use instead of a progress bar
  * in cases where it is unknown how long something is going to take.
  */
-class ProgressIndicator final : public gcn::Widget,
-                                public Widget2
+class ProgressIndicator final : public Widget
 {
     public:
-        ProgressIndicator();
+        explicit ProgressIndicator(Widget2 *const widget);
 
         A_DELETE_COPY(ProgressIndicator)
 
@@ -46,7 +43,7 @@ class ProgressIndicator final : public gcn::Widget,
 
         void logic() override final;
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
     private:
         SimpleAnimation *mIndicator;
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index e0643a8ac..bb9ae46f9 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -24,12 +24,14 @@
 
 #include "client.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "debug.h"
 
@@ -41,8 +43,7 @@ RadioButton::RadioButton(const Widget2 *const widget,
                          const std::string &restrict caption,
                          const std::string &restrict group,
                          const bool marked):
-    gcn::RadioButton(caption, group, marked),
-    Widget2(widget),
+    gcn::RadioButton(widget, caption, group, marked),
     mPadding(0),
     mImagePadding(0),
     mImageSize(9),
@@ -110,7 +111,7 @@ void RadioButton::updateAlpha()
     }
 }
 
-void RadioButton::drawBox(gcn::Graphics* graphics)
+void RadioButton::drawBox(Graphics* graphics)
 {
     if (!mSkin)
         return;
@@ -149,38 +150,37 @@ void RadioButton::drawBox(gcn::Graphics* graphics)
 
     if (box)
     {
-        static_cast<Graphics*>(graphics)->drawImage2(
-            box, mImagePadding, (getHeight() - mImageSize) / 2);
+        graphics->drawImage(box,
+            mImagePadding,
+            (getHeight() - mImageSize) / 2);
     }
 }
 
-void RadioButton::draw(gcn::Graphics* graphics)
+void RadioButton::draw(Graphics* graphics)
 {
     BLOCK_START("RadioButton::draw")
     drawBox(graphics);
 
-    gcn::Font *const font = getFont();
-    static_cast<Graphics *const>(graphics)->setColorAll(
-        mForegroundColor, mForegroundColor2);
-
+    Font *const font = getFont();
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     font->drawString(graphics, mCaption, mPadding + mImageSize + mSpacing,
         mPadding);
     BLOCK_END("RadioButton::draw")
 }
 
-void RadioButton::mouseEntered(gcn::MouseEvent& event A_UNUSED)
+void RadioButton::mouseEntered(MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void RadioButton::mouseExited(gcn::MouseEvent& event A_UNUSED)
+void RadioButton::mouseExited(MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
 
-void RadioButton::keyPressed(gcn::KeyEvent& keyEvent)
+void RadioButton::keyPressed(KeyEvent& keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
     if (action == Input::KEY_GUI_SELECT)
     {
         setSelected(true);
@@ -191,7 +191,7 @@ void RadioButton::keyPressed(gcn::KeyEvent& keyEvent)
 
 void RadioButton::adjustSize()
 {
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     setHeight(font->getHeight() + 2 * mPadding);
     setWidth(mImagePadding + mImageSize + mSpacing
         + font->getWidth(mCaption) + mPadding);
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index f5ff43f4c..2deb9a772 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -23,9 +23,7 @@
 #ifndef GUI_WIDGETS_RADIOBUTTON_H
 #define GUI_WIDGETS_RADIOBUTTON_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/radiobutton.hpp>
+#include "gui/base/widgets/radiobutton.hpp"
 
 #include "localconsts.h"
 
@@ -34,8 +32,7 @@ class Skin;
 /**
  * Guichan based RadioButton with custom look
  */
-class RadioButton final : public gcn::RadioButton,
-                          public Widget2
+class RadioButton final : public gcn::RadioButton
 {
     public:
         /**
@@ -56,25 +53,25 @@ class RadioButton final : public gcn::RadioButton,
         /**
          * Draws the radiobutton, not the caption.
          */
-        void drawBox(gcn::Graphics* graphics) override final;
+        void drawBox(Graphics* graphics) override final;
 
         /**
          * Implementation of the draw methods.
          * Thus, avoiding the rhomb around the radio button.
          */
-        void draw(gcn::Graphics* graphics) override final;
+        void draw(Graphics* graphics) override final;
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(gcn::MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) override final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(gcn::MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) override final;
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
         void updateAlpha();
 
diff --git a/src/gui/widgets/radiogroup.cpp b/src/gui/widgets/radiogroup.cpp
index d2f130c1b..9bb4f40c5 100644
--- a/src/gui/widgets/radiogroup.cpp
+++ b/src/gui/widgets/radiogroup.cpp
@@ -31,7 +31,7 @@ RadioGroup::RadioGroup(const Widget2 *const widget,
 {
 }
 
-gcn::Widget *RadioGroup::createWidget(const std::string &text) const
+Widget *RadioGroup::createWidget(const std::string &text) const
 {
     RadioButton *const widget = new RadioButton(
         this, text, mGroup, mCount == 0);
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index 1863a348c..41193b3d6 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -23,19 +23,18 @@
 
 #include "gui/widgets/widgetgroup.h"
 
-#include <guichan/widget.hpp>
-
 class RadioGroup final : public WidgetGroup
 {
     public:
         RadioGroup(const Widget2 *const widget,
-                   const std::string &group, const int height,
+                   const std::string &group,
+                   const int height,
                    const int spacing);
 
         A_DELETE_COPY(RadioGroup)
 
-        gcn::Widget *createWidget(const std::string &name)
-                                  const override final A_WARN_UNUSED;
+        Widget *createWidget(const std::string &name)
+                             const override final A_WARN_UNUSED;
 };
 
 #endif  // GUI_WIDGETS_RADIOGROUP_H
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index a260142a1..dcc3a871b 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -25,6 +25,10 @@
 #include "client.h"
 #include "graphicsvertexes.h"
 
+#include "gui/gui.h"
+
+#include "resources/image.h"
+
 #include "debug.h"
 
 int ScrollArea::instances = 0;
@@ -45,31 +49,12 @@ static std::string const buttonFiles[2] =
     "scrollbuttons_pressed.xml"
 };
 
-ScrollArea::ScrollArea(const bool opaque, const std::string &skin) :
-    gcn::ScrollArea(),
-    gcn::WidgetListener(),
-    mX(0),
-    mY(0),
-    mClickX(0),
-    mClickY(0),
-    mVertexes(new ImageCollection),
-    mVertexes2(new ImageCollection),
-    mXOffset(0),
-    mYOffset(0),
-    mDrawWidth(0),
-    mDrawHeight(0),
-    mHasMouse(false),
-    mRedraw(true)
-{
-    mOpaque = opaque;
-    addWidgetListener(this);
-    init(skin);
-}
-
-ScrollArea::ScrollArea(gcn::Widget *const widget, const bool opaque,
+ScrollArea::ScrollArea(Widget2 *const widget2,
+                       Widget *const widget,
+                       const bool opaque,
                        const std::string &skin) :
-    gcn::ScrollArea(widget),
-    gcn::WidgetListener(),
+    gcn::ScrollArea(widget2, widget),
+    WidgetListener(),
     mX(0),
     mY(0),
     mClickX(0),
@@ -194,7 +179,7 @@ void ScrollArea::logic()
     }
 
     gcn::ScrollArea::logic();
-    gcn::Widget *const content = getContent();
+    Widget *const content = getContent();
 
     // When no scrollbar in a certain direction, adapt content size to match
     // the content dimension exactly.
@@ -248,7 +233,7 @@ void ScrollArea::updateAlpha()
     }
 }
 
-void ScrollArea::draw(gcn::Graphics *graphics)
+void ScrollArea::draw(Graphics *graphics)
 {
     BLOCK_START("ScrollArea::draw")
     if (mVBarVisible || mHBarVisible)
@@ -282,8 +267,7 @@ void ScrollArea::draw(gcn::Graphics *graphics)
                     calcHMarker(graphics);
                 }
             }
-            static_cast<Graphics *const>(graphics)->drawTileCollection(
-                mVertexes);
+            graphics->drawTileCollection(mVertexes);
         }
         else
         {
@@ -315,11 +299,10 @@ void ScrollArea::draw(gcn::Graphics *graphics)
 
     if (mRedraw)
     {
-        Graphics *g = static_cast<Graphics *const>(graphics);
-        const bool redraw = g->getRedraw();
-        g->setRedraw(true);
+        const bool redraw = graphics->getRedraw();
+        graphics->setRedraw(true);
         drawChildren(graphics);
-        g->setRedraw(redraw);
+        graphics->setRedraw(redraw);
     }
     else
     {
@@ -329,14 +312,13 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     BLOCK_END("ScrollArea::draw")
 }
 
-void ScrollArea::updateCalcFlag(gcn::Graphics *const graphics)
+void ScrollArea::updateCalcFlag(Graphics *const graphics)
 {
     if (!mRedraw)
     {
         // because we don't know where parent windows was moved,
         // need recalc vertexes
-        const gcn::ClipRectangle &rect = static_cast<Graphics*>(
-            graphics)->getTopClip();
+        const ClipRect &rect = graphics->getTopClip();
         if (rect.xOffset != mXOffset || rect.yOffset != mYOffset)
         {
             mRedraw = true;
@@ -349,14 +331,14 @@ void ScrollArea::updateCalcFlag(gcn::Graphics *const graphics)
             mDrawWidth = rect.width;
             mDrawHeight = rect.height;
         }
-        else if (static_cast<Graphics*>(graphics)->getRedraw())
+        else if (graphics->getRedraw())
         {
             mRedraw = true;
         }
     }
 }
 
-void ScrollArea::drawFrame(gcn::Graphics *graphics)
+void ScrollArea::drawFrame(Graphics *graphics)
 {
     BLOCK_START("ScrollArea::drawFrame")
     if (mOpaque)
@@ -372,15 +354,18 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
             if (mRedraw)
             {
                 mVertexes2->clear();
-                static_cast<Graphics*>(graphics)->calcWindow(
-                    mVertexes2, 0, 0, w, h, background);
+                graphics->calcWindow(mVertexes2,
+                    0, 0,
+                    w, h,
+                    background);
             }
-            static_cast<Graphics*>(graphics)->drawTileCollection(mVertexes2);
+            graphics->drawTileCollection(mVertexes2);
         }
         else
         {
-            static_cast<Graphics*>(graphics)->drawImageRect(
-                0, 0, w, h, background);
+            graphics->drawImageRect(0, 0,
+                w, h,
+                background);
         }
     }
     BLOCK_END("ScrollArea::drawFrame")
@@ -392,11 +377,11 @@ void ScrollArea::setOpaque(bool opaque)
     setFrameSize(mOpaque ? 2 : 0);
 }
 
-void ScrollArea::drawButton(gcn::Graphics *const graphics,
+void ScrollArea::drawButton(Graphics *const graphics,
                             const BUTTON_DIR dir)
 {
     int state = 0;
-    gcn::Rectangle dim;
+    Rect dim;
 
     switch (dir)
     {
@@ -424,17 +409,14 @@ void ScrollArea::drawButton(gcn::Graphics *const graphics,
     }
 
     if (buttons[dir][state])
-    {
-        static_cast<Graphics*>(graphics)->drawImage2(
-            buttons[dir][state], dim.x, dim.y);
-    }
+        graphics->drawImage(buttons[dir][state], dim.x, dim.y);
 }
 
-void ScrollArea::calcButton(gcn::Graphics *const graphics,
+void ScrollArea::calcButton(Graphics *const graphics,
                             const BUTTON_DIR dir)
 {
     int state = 0;
-    gcn::Rectangle dim;
+    Rect dim;
 
     switch (dir)
     {
@@ -468,187 +450,213 @@ void ScrollArea::calcButton(gcn::Graphics *const graphics,
     }
 }
 
-void ScrollArea::drawVBar(gcn::Graphics *const graphics)
+void ScrollArea::drawVBar(Graphics *const graphics)
 {
-    const gcn::Rectangle &dim = getVerticalBarDimension();
-    Graphics *const g = static_cast<Graphics*>(graphics);
+    const Rect &dim = getVerticalBarDimension();
 
     if (vBackground.grid[4])
     {
-        g->drawPattern(vBackground.grid[4],
+        graphics->drawPattern(vBackground.grid[4],
             dim.x, dim.y, dim.width, dim.height);
     }
     if (vBackground.grid[1])
     {
-        g->drawPattern(vBackground.grid[1],
-            dim.x, dim.y, dim.width, vBackground.grid[1]->getHeight());
+        graphics->drawPattern(vBackground.grid[1],
+            dim.x, dim.y,
+            dim.width, vBackground.grid[1]->getHeight());
     }
     if (vBackground.grid[7])
     {
-        g->drawPattern(vBackground.grid[7],
+        graphics->drawPattern(vBackground.grid[7],
             dim.x, dim.height - vBackground.grid[7]->getHeight() + dim.y,
             dim.width, vBackground.grid[7]->getHeight());
     }
 }
 
-void ScrollArea::calcVBar(gcn::Graphics *const graphics)
+void ScrollArea::calcVBar(Graphics *const graphics)
 {
-    const gcn::Rectangle &dim = getVerticalBarDimension();
-    Graphics *const g = static_cast<Graphics *const>(graphics);
+    const Rect &dim = getVerticalBarDimension();
 
     if (vBackground.grid[4])
     {
-        g->calcPattern(mVertexes, vBackground.grid[4],
-            dim.x, dim.y, dim.width, dim.height);
+        graphics->calcPattern(mVertexes,
+            vBackground.grid[4],
+            dim.x, dim.y,
+            dim.width, dim.height);
     }
     if (vBackground.grid[1])
     {
-        g->calcPattern(mVertexes, vBackground.grid[1],
-            dim.x, dim.y, dim.width, vBackground.grid[1]->getHeight());
+        graphics->calcPattern(mVertexes,
+            vBackground.grid[1],
+            dim.x, dim.y,
+            dim.width, vBackground.grid[1]->getHeight());
     }
     if (vBackground.grid[7])
     {
-        g->calcPattern(mVertexes, vBackground.grid[7],
+        graphics->calcPattern(mVertexes,
+            vBackground.grid[7],
             dim.x, dim.height - vBackground.grid[7]->getHeight() + dim.y,
             dim.width, vBackground.grid[7]->getHeight());
     }
 }
 
-void ScrollArea::drawHBar(gcn::Graphics *const graphics)
+void ScrollArea::drawHBar(Graphics *const graphics)
 {
-    const gcn::Rectangle &dim = getHorizontalBarDimension();
-    Graphics *const g = static_cast<Graphics*>(graphics);
+    const Rect &dim = getHorizontalBarDimension();
 
     if (hBackground.grid[4])
     {
-        g->drawPattern(hBackground.grid[4],
-            dim.x, dim.y, dim.width, dim.height);
+        graphics->drawPattern(hBackground.grid[4],
+            dim.x, dim.y,
+            dim.width, dim.height);
     }
 
     if (hBackground.grid[3])
     {
-        g->drawPattern(hBackground.grid[3],
-            dim.x, dim.y, hBackground.grid[3]->getWidth(), dim.height);
+        graphics->drawPattern(hBackground.grid[3],
+            dim.x, dim.y,
+            hBackground.grid[3]->getWidth(), dim.height);
     }
 
     if (hBackground.grid[5])
     {
-        g->drawPattern(hBackground.grid[5],
-            dim.x + dim.width - hBackground.grid[5]->getWidth(), dim.y,
-            hBackground.grid[5]->getWidth(), dim.height);
+        graphics->drawPattern(hBackground.grid[5],
+            dim.x + dim.width - hBackground.grid[5]->getWidth(),
+            dim.y,
+            hBackground.grid[5]->getWidth(),
+            dim.height);
     }
 }
 
-void ScrollArea::calcHBar(gcn::Graphics *const graphics)
+void ScrollArea::calcHBar(Graphics *const graphics)
 {
-    const gcn::Rectangle &dim = getHorizontalBarDimension();
-    Graphics *const g = static_cast<Graphics*>(graphics);
+    const Rect &dim = getHorizontalBarDimension();
 
     if (hBackground.grid[4])
     {
-        g->calcPattern(mVertexes, hBackground.grid[4],
-            dim.x, dim.y, dim.width, dim.height);
+        graphics->calcPattern(mVertexes,
+            hBackground.grid[4],
+            dim.x, dim.y,
+            dim.width, dim.height);
     }
 
     if (hBackground.grid[3])
     {
-        g->calcPattern(mVertexes, hBackground.grid[3],
-            dim.x, dim.y, hBackground.grid[3]->getWidth(), dim.height);
+        graphics->calcPattern(mVertexes,
+            hBackground.grid[3],
+            dim.x, dim.y,
+            hBackground.grid[3]->getWidth(), dim.height);
     }
 
     if (hBackground.grid[5])
     {
-        g->calcPattern(mVertexes, hBackground.grid[5],
-            dim.x + dim.width - hBackground.grid[5]->getWidth(), dim.y,
-            hBackground.grid[5]->getWidth(), dim.height);
+        graphics->calcPattern(mVertexes,
+            hBackground.grid[5],
+            dim.x + dim.width - hBackground.grid[5]->getWidth(),
+            dim.y,
+            hBackground.grid[5]->getWidth(),
+            dim.height);
     }
 }
 
-void ScrollArea::drawVMarker(gcn::Graphics *const graphics)
+void ScrollArea::drawVMarker(Graphics *const graphics)
 {
-    const gcn::Rectangle &dim = getVerticalMarkerDimension();
+    const Rect &dim = getVerticalMarkerDimension();
 
     if ((mHasMouse) && (mX > (mDimension.width - mScrollbarWidth)))
     {
-        static_cast<Graphics*>(graphics)->
-            drawImageRect(dim.x, dim.y, dim.width, dim.height, vMarkerHi);
+        graphics->drawImageRect(dim.x, dim.y,
+            dim.width, dim.height,
+            vMarkerHi);
     }
     else
     {
-        static_cast<Graphics*>(graphics)->
-            drawImageRect(dim.x, dim.y, dim.width, dim.height, vMarker);
+        graphics->drawImageRect(dim.x, dim.y,
+            dim.width, dim.height,
+            vMarker);
     }
 }
 
-void ScrollArea::calcVMarker(gcn::Graphics *const graphics)
+void ScrollArea::calcVMarker(Graphics *const graphics)
 {
-    const gcn::Rectangle &dim = getVerticalMarkerDimension();
+    const Rect &dim = getVerticalMarkerDimension();
 
     if ((mHasMouse) && (mX > (mDimension.width - mScrollbarWidth)))
     {
-        static_cast<Graphics*>(graphics)->calcWindow(
-            mVertexes, dim.x, dim.y, dim.width, dim.height, vMarkerHi);
+        graphics->calcWindow(mVertexes,
+            dim.x, dim.y,
+            dim.width, dim.height,
+            vMarkerHi);
     }
     else
     {
-        static_cast<Graphics*>(graphics)->calcWindow(
-            mVertexes, dim.x, dim.y, dim.width, dim.height, vMarker);
+        graphics->calcWindow(mVertexes,
+            dim.x, dim.y,
+            dim.width, dim.height,
+            vMarker);
     }
 }
 
-void ScrollArea::drawHMarker(gcn::Graphics *const graphics)
+void ScrollArea::drawHMarker(Graphics *const graphics)
 {
-    const gcn::Rectangle dim = getHorizontalMarkerDimension();
+    const Rect dim = getHorizontalMarkerDimension();
 
     if ((mHasMouse) && (mY > (mDimension.height - mScrollbarWidth)))
     {
-        static_cast<Graphics*>(graphics)->
-            drawImageRect(dim.x, dim.y, dim.width, dim.height, vMarkerHi);
+        graphics->drawImageRect(dim.x, dim.y,
+            dim.width, dim.height,
+            vMarkerHi);
     }
     else
     {
-        static_cast<Graphics*>(graphics)->
-            drawImageRect(dim.x, dim.y, dim.width, dim.height, vMarker);
+        graphics->drawImageRect(
+            dim.x, dim.y,
+            dim.width, dim.height,
+            vMarker);
     }
 }
 
-void ScrollArea::calcHMarker(gcn::Graphics *const graphics)
+void ScrollArea::calcHMarker(Graphics *const graphics)
 {
-    const gcn::Rectangle dim = getHorizontalMarkerDimension();
+    const Rect dim = getHorizontalMarkerDimension();
 
     if ((mHasMouse) && (mY > (mDimension.height - mScrollbarWidth)))
     {
-        static_cast<Graphics*>(graphics)->calcWindow(
-            mVertexes, dim.x, dim.y, dim.width, dim.height, vMarkerHi);
+        graphics->calcWindow(mVertexes,
+            dim.x, dim.y,
+            dim.width, dim.height,
+            vMarkerHi);
     }
     else
     {
-        static_cast<Graphics*>(graphics)->calcWindow(
-            mVertexes, dim.x, dim.y, dim.width, dim.height, vMarker);
+        graphics->calcWindow(mVertexes,
+            dim.x, dim.y,
+            dim.width, dim.height,
+            vMarker);
     }
 }
 
-void ScrollArea::mouseMoved(gcn::MouseEvent& event)
+void ScrollArea::mouseMoved(MouseEvent& event)
 {
     mX = event.getX();
     mY = event.getY();
 }
 
-void ScrollArea::mouseEntered(gcn::MouseEvent& event A_UNUSED)
+void ScrollArea::mouseEntered(MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void ScrollArea::mouseExited(gcn::MouseEvent& event A_UNUSED)
+void ScrollArea::mouseExited(MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
 
-void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
+void ScrollArea::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
     const unsigned int frameSize = 2 * mFrameSize;
-    gcn::Widget *const content = getContent();
+    Widget *const content = getContent();
     if (content)
     {
         content->setSize(mDimension.width - frameSize,
@@ -656,12 +664,12 @@ void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
     }
 }
 
-void ScrollArea::widgetMoved(const gcn::Event& event A_UNUSED)
+void ScrollArea::widgetMoved(const Event& event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void ScrollArea::mousePressed(gcn::MouseEvent& event)
+void ScrollArea::mousePressed(MouseEvent& event)
 {
     const int x = event.getX();
     const int y = event.getY();
@@ -731,16 +739,16 @@ void ScrollArea::mousePressed(gcn::MouseEvent& event)
         }
     }
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         mClickX = event.getX();
         mClickY = event.getY();
     }
 }
 
-void ScrollArea::mouseReleased(gcn::MouseEvent& event)
+void ScrollArea::mouseReleased(MouseEvent& event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT && mClickX && mClickY)
+    if (event.getButton() == MouseEvent::LEFT && mClickX && mClickY)
     {
         if (!event.isConsumed())
         {
@@ -799,11 +807,11 @@ void ScrollArea::mouseReleased(gcn::MouseEvent& event)
     mRedraw = true;
 }
 
-void ScrollArea::mouseDragged(gcn::MouseEvent &event)
+void ScrollArea::mouseDragged(MouseEvent &event)
 {
     if (mIsVerticalMarkerDragged)
     {
-        const gcn::Rectangle barDim = getVerticalBarDimension();
+        const Rect barDim = getVerticalBarDimension();
 
         const int pos = event.getY() - barDim.y
               - mVerticalMarkerDragOffset;
@@ -822,7 +830,7 @@ void ScrollArea::mouseDragged(gcn::MouseEvent &event)
 
     if (mIsHorizontalMarkerDragged)
     {
-        const gcn::Rectangle barDim = getHorizontalBarDimension();
+        const Rect barDim = getHorizontalBarDimension();
 
         const int pos = event.getX() - barDim.x
             - mHorizontalMarkerDragOffset;
@@ -843,56 +851,56 @@ void ScrollArea::mouseDragged(gcn::MouseEvent &event)
     mRedraw = true;
 }
 
-gcn::Rectangle ScrollArea::getVerticalBarDimension() const
+Rect ScrollArea::getVerticalBarDimension() const
 {
     if (!mVBarVisible)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
     const int height = (mVBarVisible && mShowButtons) ? mScrollbarWidth : 0;
     if (mHBarVisible)
     {
-        return gcn::Rectangle(mDimension.width - mScrollbarWidth,
+        return Rect(mDimension.width - mScrollbarWidth,
             height,
             mScrollbarWidth,
             mDimension.height - 2 * height - mScrollbarWidth);
     }
 
-    return gcn::Rectangle(mDimension.width - mScrollbarWidth,
+    return Rect(mDimension.width - mScrollbarWidth,
         height,
         mScrollbarWidth,
         mDimension.height - 2 * height);
 }
 
-gcn::Rectangle ScrollArea::getHorizontalBarDimension() const
+Rect ScrollArea::getHorizontalBarDimension() const
 {
     if (!mHBarVisible)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
     const int width = mShowButtons ? mScrollbarWidth : 0;
     if (mVBarVisible)
     {
-        return gcn::Rectangle(width,
+        return Rect(width,
             mDimension.height - mScrollbarWidth,
             mDimension.width - 2 * width - mScrollbarWidth,
             mScrollbarWidth);
     }
 
-    return gcn::Rectangle(width,
+    return Rect(width,
                       mDimension.height - mScrollbarWidth,
                       mDimension.width - 2 * width,
                       mScrollbarWidth);
 }
 
-gcn::Rectangle ScrollArea::getVerticalMarkerDimension()
+Rect ScrollArea::getVerticalMarkerDimension()
 {
     if (!mVBarVisible)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
     int length, pos;
     int height;
     const int h2 = mShowButtons
         ? mScrollbarWidth : mMarkerSize / 2;
-    const gcn::Widget *content;
+    const Widget *content;
     if (!mWidgets.empty())
         content = *mWidgets.begin();
     else
@@ -937,20 +945,20 @@ gcn::Rectangle ScrollArea::getVerticalMarkerDimension()
             pos = 0;
     }
 
-    return gcn::Rectangle(mDimension.width - mScrollbarWidth, h2 + pos,
+    return Rect(mDimension.width - mScrollbarWidth, h2 + pos,
         mScrollbarWidth, length);
 }
 
-gcn::Rectangle ScrollArea::getHorizontalMarkerDimension()
+Rect ScrollArea::getHorizontalMarkerDimension()
 {
     if (!mHBarVisible)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
     int length, pos;
     int width;
     const int w2 = mShowButtons
         ? mScrollbarWidth : mMarkerSize / 2;
-    const gcn::Widget *content;
+    const Widget *content;
     if (!mWidgets.empty())
         content = *mWidgets.begin();
     else
@@ -999,61 +1007,61 @@ gcn::Rectangle ScrollArea::getHorizontalMarkerDimension()
         }
     }
 
-    return gcn::Rectangle(w2 + pos, mDimension.height - mScrollbarWidth,
+    return Rect(w2 + pos, mDimension.height - mScrollbarWidth,
         length, mScrollbarWidth);
 }
 
-gcn::Rectangle ScrollArea::getUpButtonDimension() const
+Rect ScrollArea::getUpButtonDimension() const
 {
     if (!mVBarVisible || !mShowButtons)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
-    return gcn::Rectangle(mDimension.width - mScrollbarWidth, 0,
+    return Rect(mDimension.width - mScrollbarWidth, 0,
         mScrollbarWidth, mScrollbarWidth);
 }
 
-gcn::Rectangle ScrollArea::getDownButtonDimension() const
+Rect ScrollArea::getDownButtonDimension() const
 {
     if (!mVBarVisible || !mShowButtons)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
     if (mVBarVisible && mHBarVisible)
     {
-        return gcn::Rectangle(mDimension.width - mScrollbarWidth,
+        return Rect(mDimension.width - mScrollbarWidth,
             mDimension.height - mScrollbarWidth*2,
             mScrollbarWidth,
             mScrollbarWidth);
     }
 
-    return gcn::Rectangle(mDimension.width - mScrollbarWidth,
+    return Rect(mDimension.width - mScrollbarWidth,
         mDimension.height - mScrollbarWidth,
         mScrollbarWidth,
         mScrollbarWidth);
 }
 
-gcn::Rectangle ScrollArea::getLeftButtonDimension() const
+Rect ScrollArea::getLeftButtonDimension() const
 {
     if (!mHBarVisible || !mShowButtons)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
-    return gcn::Rectangle(0, mDimension.height - mScrollbarWidth,
+    return Rect(0, mDimension.height - mScrollbarWidth,
         mScrollbarWidth, mScrollbarWidth);
 }
 
-gcn::Rectangle ScrollArea::getRightButtonDimension() const
+Rect ScrollArea::getRightButtonDimension() const
 {
     if (!mHBarVisible || !mShowButtons)
-        return gcn::Rectangle(0, 0, 0, 0);
+        return Rect(0, 0, 0, 0);
 
     if (mVBarVisible && mHBarVisible)
     {
-        return gcn::Rectangle(mDimension.width - mScrollbarWidth*2,
+        return Rect(mDimension.width - mScrollbarWidth*2,
             mDimension.height - mScrollbarWidth,
             mScrollbarWidth,
             mScrollbarWidth);
     }
 
-    return gcn::Rectangle(mDimension.width - mScrollbarWidth,
+    return Rect(mDimension.width - mScrollbarWidth,
         mDimension.height - mScrollbarWidth,
         mScrollbarWidth,
         mScrollbarWidth);
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 13e5e3665..7d2b39a96 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -23,10 +23,9 @@
 #ifndef GUI_WIDGETS_SCROLLAREA_H
 #define GUI_WIDGETS_SCROLLAREA_H
 
-#include "gui/widgets/widget2.h"
+#include "gui/base/widgets/scrollarea.hpp"
 
-#include <guichan/widgets/scrollarea.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -43,25 +42,18 @@ class ImageCollection;
  * \ingroup GUI
  */
 class ScrollArea final : public gcn::ScrollArea,
-                         public Widget2,
-                         public gcn::WidgetListener
+                         public WidgetListener
 {
     public:
         /**
-         * Constructor that takes no content. Needed for use with the DropDown
-         * class.
-         */
-        explicit ScrollArea(const bool opaque = true,
-                            const std::string &skin = "");
-
-        /**
          * Constructor.
          *
          * @param content the initial content to show in the scroll area
          */
-        explicit ScrollArea(gcn::Widget *const widget,
-                            const bool opaque = true,
-                            const std::string &skin = "");
+        ScrollArea(Widget2 *const widget2,
+                   Widget *const widget,
+                   const bool opaque = true,
+                   const std::string &skin = "");
 
         A_DELETE_COPY(ScrollArea)
 
@@ -84,12 +76,12 @@ class ScrollArea final : public gcn::ScrollArea,
         /**
          * Draws the scroll area.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Draws the background and border of the scroll area.
          */
-        void drawFrame(gcn::Graphics *graphics) override final;
+        void drawFrame(Graphics *graphics) override final;
 
         /**
          * Sets whether the widget should draw its background or not.
@@ -105,43 +97,43 @@ class ScrollArea final : public gcn::ScrollArea,
         /**
          * Called when the mouse moves in the widget area.
          */
-        void mouseMoved(gcn::MouseEvent& event) override final;
+        void mouseMoved(MouseEvent& event) override final;
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(gcn::MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) override final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(gcn::MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) override final;
 
-        void mousePressed(gcn::MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) override final;
 
-        void mouseReleased(gcn::MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) override final;
 
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
-        gcn::Rectangle getVerticalBarDimension() const;
+        Rect getVerticalBarDimension() const;
 
-        gcn::Rectangle getHorizontalBarDimension() const;
+        Rect getHorizontalBarDimension() const;
 
-        gcn::Rectangle getVerticalMarkerDimension();
+        Rect getVerticalMarkerDimension();
 
-        gcn::Rectangle getHorizontalMarkerDimension();
+        Rect getHorizontalMarkerDimension();
 
-        gcn::Rectangle getUpButtonDimension() const;
+        Rect getUpButtonDimension() const;
 
-        gcn::Rectangle getDownButtonDimension() const;
+        Rect getDownButtonDimension() const;
 
-        gcn::Rectangle getLeftButtonDimension() const;
+        Rect getLeftButtonDimension() const;
 
-        gcn::Rectangle getRightButtonDimension() const;
+        Rect getRightButtonDimension() const;
 
     protected:
         enum BUTTON_DIR
@@ -158,19 +150,19 @@ class ScrollArea final : public gcn::ScrollArea,
          */
         void init(std::string skinName);
 
-        void drawButton(gcn::Graphics *const graphics, const BUTTON_DIR dir);
-        void calcButton(gcn::Graphics *const graphics, const BUTTON_DIR dir);
-        void drawVBar(gcn::Graphics *const graphics) override final;
-        void drawHBar(gcn::Graphics *const graphics) override final;
-        void drawVMarker(gcn::Graphics *const graphics) override final;
-        void drawHMarker(gcn::Graphics *const graphics) override final;
+        void drawButton(Graphics *const graphics, const BUTTON_DIR dir);
+        void calcButton(Graphics *const graphics, const BUTTON_DIR dir);
+        void drawVBar(Graphics *const graphics) override final;
+        void drawHBar(Graphics *const graphics) override final;
+        void drawVMarker(Graphics *const graphics) override final;
+        void drawHMarker(Graphics *const graphics) override final;
 
-        void calcVBar(gcn::Graphics *const graphics);
-        void calcHBar(gcn::Graphics *const graphics);
-        void calcVMarker(gcn::Graphics *const graphics);
-        void calcHMarker(gcn::Graphics *const graphics);
+        void calcVBar(Graphics *const graphics);
+        void calcHBar(Graphics *const graphics);
+        void calcVMarker(Graphics *const graphics);
+        void calcHMarker(Graphics *const graphics);
 
-        void updateCalcFlag(gcn::Graphics *const graphics);
+        void updateCalcFlag(Graphics *const graphics);
 
         static int instances;
         static float mAlpha;
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 2cb7f60d1..218efe8a2 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -24,10 +24,12 @@
 #include "main.h"
 #include "soundmanager.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/windows/editdialog.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/horizontcontainer.h"
@@ -37,12 +39,12 @@
 #include "gui/widgets/sliderlist.h"
 #include "gui/widgets/vertcontainer.h"
 
+#include "gui/widgets/tabs/setuptabscroll.h"
+
 #include "utils/base64.h"
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 SetupItem::SetupItem(const std::string &restrict text,
@@ -51,8 +53,8 @@ SetupItem::SetupItem(const std::string &restrict text,
                      SetupTabScroll *restrict const parent,
                      const std::string &restrict eventName,
                      const bool mainConfig) :
-    gcn::ActionListener(),
-    Widget2(),
+    ActionListener(),
+    Widget2(parent),
     mText(text),
     mDescription(description),
     mKeyName(keyName),
@@ -75,8 +77,8 @@ SetupItem::SetupItem(const std::string &restrict text,
                      const std::string &restrict eventName,
                      const std::string &restrict def,
                      const bool mainConfig) :
-    gcn::ActionListener(),
-    Widget2(),
+    ActionListener(),
+    Widget2(parent),
     mText(text),
     mDescription(description),
     mKeyName(keyName),
@@ -154,7 +156,7 @@ std::string SetupItem::getActionEventId() const
     return mWidget->getActionEventId();
 }
 
-void SetupItem::action(const gcn::ActionEvent &event)
+void SetupItem::action(const ActionEvent &event)
 {
     if (!mWidget)
         return;
@@ -189,7 +191,7 @@ void SetupItem::externalUnloaded(const std::string &eventName A_UNUSED)
 {
 }
 
-void SetupItem::fixFirstItemSize(gcn::Widget *const widget)
+void SetupItem::fixFirstItemSize(Widget *const widget)
 {
     const int maxSize = mParent->getPreferredFirstItemSize();
     if (widget->getWidth() < maxSize)
@@ -393,7 +395,7 @@ void SetupItemTextField::toWidget()
     mTextField->setText(mValue);
 }
 
-void SetupItemTextField::action(const gcn::ActionEvent &event)
+void SetupItemTextField::action(const ActionEvent &event)
 {
     if (!mTextField)
         return;
@@ -529,7 +531,7 @@ void SetupItemIntTextField::toWidget()
     mTextField->setText(mValue);
 }
 
-void SetupItemIntTextField::action(const gcn::ActionEvent &event)
+void SetupItemIntTextField::action(const ActionEvent &event)
 {
     if (!mTextField)
         return;
@@ -609,7 +611,7 @@ void SetupItemLabel::toWidget()
 {
 }
 
-void SetupItemLabel::action(const gcn::ActionEvent &event A_UNUSED)
+void SetupItemLabel::action(const ActionEvent &event A_UNUSED)
 {
 }
 
@@ -623,7 +625,7 @@ SetupItemDropDown::SetupItemDropDown(const std::string &restrict text,
                                      const std::string &restrict keyName,
                                      SetupTabScroll *restrict const parent,
                                      const std::string &restrict eventName,
-                                     gcn::ListModel *restrict const model,
+                                     ListModel *restrict const model,
                                      const int width,
                                      const bool mainConfig) :
     SetupItem(text, description, keyName, parent, eventName, mainConfig),
@@ -642,7 +644,7 @@ SetupItemDropDown::SetupItemDropDown(const std::string &restrict text,
                                      const std::string &restrict keyName,
                                      SetupTabScroll *restrict const parent,
                                      const std::string &restrict eventName,
-                                     gcn::ListModel *restrict const model,
+                                     ListModel *restrict const model,
                                      const int width,
                                      const std::string &restrict def,
                                      const bool mainConfig) :
@@ -764,7 +766,7 @@ void SetupItemSlider::createControls()
     mHorizont = new HorizontContainer(this, 32, 2);
 
     mLabel = new Label(this, mText);
-    mSlider = new Slider(mMin, mMax);
+    mSlider = new Slider(this, mMin, mMax);
     mSlider->setActionEventId(mEventName);
     mSlider->addActionListener(mParent);
     mSlider->setValue2(atof(mValue.c_str()));
@@ -799,7 +801,7 @@ void SetupItemSlider::toWidget()
     mSlider->setValue2(atof(mValue.c_str()));
 }
 
-void SetupItemSlider::action(const gcn::ActionEvent &event A_UNUSED)
+void SetupItemSlider::action(const ActionEvent &event A_UNUSED)
 {
     fromWidget();
     if (mOnTheFly)
@@ -888,7 +890,7 @@ void SetupItemSlider2::createControls()
     mLabel = new Label(this, mText);
     mLabel2 = new Label(this, "");
     mLabel2->setWidth(width);
-    mSlider = new Slider(mMin, mMax);
+    mSlider = new Slider(this, mMin, mMax);
     mSlider->setActionEventId(mEventName);
     mSlider->addActionListener(mParent);
     mSlider->setValue2(atof(mValue.c_str()));
@@ -918,7 +920,7 @@ int SetupItemSlider2::getMaxWidth()
     int maxWidth = 0;
     SetupItemNamesConstIter it = mValues->begin();
     const SetupItemNamesConstIter it_end = mValues->end();
-    const gcn::Font *const font = gui->getFont();
+    const Font *const font = gui->getFont();
 
     while (it != it_end)
     {
@@ -954,7 +956,7 @@ void SetupItemSlider2::toWidget()
     updateLabel();
 }
 
-void SetupItemSlider2::action(const gcn::ActionEvent &event A_UNUSED)
+void SetupItemSlider2::action(const ActionEvent &event A_UNUSED)
 {
     fromWidget();
     updateLabel();
@@ -1002,7 +1004,7 @@ SetupItemSliderList::SetupItemSliderList(const std::string &restrict text,
                                          const std::string &restrict keyName,
                                          SetupTabScroll *restrict const parent,
                                          const std::string &restrict eventName,
-                                         gcn::ListModel *restrict const model,
+                                         ListModel *restrict const model,
                                          const int width, const bool onTheFly,
                                          const bool mainConfig) :
     SetupItem(text, description, keyName, parent, eventName, mainConfig),
@@ -1022,7 +1024,7 @@ SetupItemSliderList::SetupItemSliderList(const std::string &restrict text,
                                          const std::string &restrict keyName,
                                          SetupTabScroll *restrict const parent,
                                          const std::string &restrict eventName,
-                                         gcn::ListModel *restrict const model,
+                                         ListModel *restrict const model,
                                          const std::string &restrict def,
                                          const int width,
                                          const bool onTheFly,
@@ -1086,7 +1088,7 @@ void SetupItemSliderList::toWidget()
     mSlider->setSelectedString(mValue);
 }
 
-void SetupItemSliderList::action(const gcn::ActionEvent &event A_UNUSED)
+void SetupItemSliderList::action(const ActionEvent &event A_UNUSED)
 {
     fromWidget();
     if (mOnTheFly)
@@ -1107,7 +1109,7 @@ SetupItemSound::SetupItemSound(const std::string &restrict text,
                                const std::string &restrict keyName,
                                SetupTabScroll *restrict const parent,
                                const std::string &restrict eventName,
-                               gcn::ListModel *restrict const model,
+                               ListModel *restrict const model,
                                const int width, const bool onTheFly,
                                const bool mainConfig) :
     SetupItemSliderList(text, description, keyName, parent, eventName,
@@ -1124,7 +1126,7 @@ void SetupItemSound::addMoreControls()
     mHorizont->add(mButton);
 }
 
-void SetupItemSound::action(const gcn::ActionEvent &event)
+void SetupItemSound::action(const ActionEvent &event)
 {
     if (event.getId() == mEventName + "_PLAY")
     {
@@ -1145,7 +1147,7 @@ SetupItemSliderInt::SetupItemSliderInt(const std::string &restrict text,
                                        const std::string &restrict keyName,
                                        SetupTabScroll *restrict const parent,
                                        const std::string &restrict eventName,
-                                       gcn::ListModel *restrict const model,
+                                       ListModel *restrict const model,
                                        const int min,
                                        const int width,
                                        const bool onTheFly,
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index c72bb39ef..7dee860be 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -21,14 +21,14 @@
 #ifndef GUI_WIDGETS_SETUPITEM_H
 #define GUI_WIDGETS_SETUPITEM_H
 
-#include "gui/widgets/button.h"
-#include "gui/widgets/tabs/setuptabscroll.h"
+#include "gui/widgets/widget2.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <list>
 #include <vector>
 
+class Button;
 class CheckBox;
 class Configuration;
 class DropDown;
@@ -36,16 +36,13 @@ class EditDialog;
 class HorizontContainer;
 class IntTextField;
 class Label;
+class ListModel;
+class SetupTabScroll;
 class Slider;
 class SliderList;
 class TextField;
 
-namespace gcn
-{
-    class ListModel;
-}
-
-class SetupItem : public gcn::ActionListener,
+class SetupItem : public ActionListener,
                   public Widget2
 {
     public:
@@ -69,17 +66,17 @@ class SetupItem : public gcn::ActionListener,
 
         virtual void toWidget() = 0;
 
-        void setWidget(gcn::Widget *widget)
+        void setWidget(Widget *widget)
         { mWidget = widget; }
 
-        gcn::Widget *getWidget() const A_WARN_UNUSED
+        Widget *getWidget() const A_WARN_UNUSED
         { return mWidget; }
 
         Configuration *getConfig() const A_WARN_UNUSED;
 
         virtual std::string getActionEventId() const A_WARN_UNUSED;
 
-        virtual void action(const gcn::ActionEvent &event) override;
+        virtual void action(const ActionEvent &event) override;
 
         virtual void action();
 
@@ -94,11 +91,11 @@ class SetupItem : public gcn::ActionListener,
         bool isMainConfig() const A_WARN_UNUSED
         { return mMainConfig; }
 
-        void fixFirstItemSize(gcn::Widget *const widget);
+        void fixFirstItemSize(Widget *const widget);
 
         virtual void rereadValue();
 
-        void setValue(const std::string str)
+        void setValue(const std::string &str)
         { mValue = str; }
 
         std::string getValue() const
@@ -137,9 +134,9 @@ class SetupItem : public gcn::ActionListener,
 
         std::string mDefault;
 
-        gcn::Widget *mWidget;
+        Widget *mWidget;
 
-        std::list<gcn::Widget*> mTempWidgets;
+        std::list<Widget*> mTempWidgets;
 
         int mValueType;
 
@@ -210,7 +207,7 @@ class SetupItemTextField final : public SetupItem
 
         void toWidget() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void apply(const std::string &eventName) override final;
 
@@ -265,7 +262,7 @@ class SetupItemIntTextField final : public SetupItem
 
         void toWidget() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void apply(const std::string &eventName) override final;
 
@@ -297,7 +294,7 @@ class SetupItemLabel final : public SetupItem
 
         void toWidget() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void apply(const std::string &eventName) override final;
 
@@ -314,7 +311,7 @@ class SetupItemDropDown final : public SetupItem
                           const std::string &restrict keyName,
                           SetupTabScroll *restrict const parent,
                           const std::string &restrict eventName,
-                          gcn::ListModel *restrict const model,
+                          ListModel *restrict const model,
                           const int width, const bool mainConfig = true);
 
         SetupItemDropDown(const std::string &restrict text,
@@ -322,7 +319,7 @@ class SetupItemDropDown final : public SetupItem
                           const std::string &restrict keyName,
                           SetupTabScroll *restrict const parent,
                           const std::string &restrict eventName,
-                          gcn::ListModel *restrict const model,
+                          ListModel *restrict const model,
                           const int width,
                           const std::string &restrict def,
                           const bool mainConfig = true);
@@ -340,7 +337,7 @@ class SetupItemDropDown final : public SetupItem
     protected:
         HorizontContainer *mHorizont;
         Label *mLabel;
-        gcn::ListModel *mModel;
+        ListModel *mModel;
         DropDown *mDropDown;
         int mWidth;
 };
@@ -377,7 +374,7 @@ class SetupItemSlider final : public SetupItem
 
         void toWidget() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void apply(const std::string &eventName) override final;
 
@@ -433,7 +430,7 @@ class SetupItemSlider2 final : public SetupItem
 
         void toWidget() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void apply(const std::string &eventName) override final;
 
@@ -470,7 +467,7 @@ class SetupItemSliderList : public SetupItem
 
         void toWidget() override;
 
-        virtual void action(const gcn::ActionEvent &event) override;
+        virtual void action(const ActionEvent &event) override;
 
         void apply(const std::string &eventName) override final;
 
@@ -482,7 +479,7 @@ class SetupItemSliderList : public SetupItem
                             const std::string &restrict keyName,
                             SetupTabScroll *restrict const parent,
                             const std::string &restrict eventName,
-                            gcn::ListModel *restrict const model,
+                            ListModel *restrict const model,
                             const int width = 150, const bool onTheFly = false,
                             const bool mainConfig = true);
 
@@ -491,7 +488,7 @@ class SetupItemSliderList : public SetupItem
                             const std::string &restrict keyName,
                             SetupTabScroll *restrict const parent,
                             const std::string &restrict eventName,
-                            gcn::ListModel *restrict const model,
+                            ListModel *restrict const model,
                             const std::string &restrict def,
                             const int width = 150,
                             const bool onTheFly = false,
@@ -500,7 +497,7 @@ class SetupItemSliderList : public SetupItem
         HorizontContainer *mHorizont;
         Label *mLabel;
         SliderList *mSlider;
-        gcn::ListModel *mModel;
+        ListModel *mModel;
         int mWidth;
         bool mOnTheFly;
 };
@@ -513,14 +510,14 @@ class SetupItemSound final : public SetupItemSliderList
                        const std::string &restrict keyName,
                        SetupTabScroll *restrict const parent,
                        const std::string &restrict eventName,
-                       gcn::ListModel *restrict const model,
+                       ListModel *restrict const model,
                        const int width = 150,
                        const bool onTheFly = false,
                        const bool mainConfig = true);
 
         A_DELETE_COPY(SetupItemSound)
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void addMoreControls() override final;
 
@@ -536,7 +533,7 @@ class SetupItemSliderInt final : public SetupItemSliderList
                            const std::string &restrict keyName,
                            SetupTabScroll *restrict const parent,
                            const std::string &restrict eventName,
-                           gcn::ListModel *restrict const model,
+                           ListModel *restrict const model,
                            const int min,
                            const int width = 150,
                            const bool onTheFly = false,
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index b080de428..3c8238fd0 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -20,74 +20,18 @@
 
 #include "gui/widgets/setuptouchitem.h"
 
-#include "gui/setupactiondata.h"
+#include "gui/models/touchactionmodel.h"
 
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/horizontcontainer.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/vertcontainer.h"
 
-#include <algorithm>
+#include "gui/widgets/tabs/setuptabscroll.h"
 
-#include "debug.h"
-
-static class SortTouchActionFunctor final
-{
-    public:
-        bool operator() (const SetupActionData *const data1,
-                         const SetupActionData *const data2) const
-        {
-            if (!data1 || !data2)
-                return false;
-            return data1->name < data2->name;
-        }
-} touchActionSorter;
-
-TouchActionsModel::TouchActionsModel() :
-    NamesModel(),
-    mActionId(),
-    mActionToSelection()
-{
-    std::vector<SetupActionData*> data;
-
-    for (int f = 0, sz = touchActionDataSize; f < sz; f ++)
-    {
-        int k = 0;
-        while (!touchActionData[f][k].name.empty())
-        {
-            data.push_back(&touchActionData[f][k]);
-            k ++;
-        }
-    }
-
-    std::sort(data.begin(), data.end(), touchActionSorter);
-    int cnt = 0;
-    FOR_EACH (std::vector<SetupActionData*>::iterator, it, data)
-    {
-        const SetupActionData *const data1 = *it;
-        mNames.push_back(data1->name);
-        mActionId.push_back(data1->actionId);
-        mActionToSelection[data1->actionId] = cnt;
-        cnt ++;
-    }
-}
-
-int TouchActionsModel::getActionFromSelection(const int sel) const
-{
-    if (sel < 0 || sel > static_cast<signed int>(mActionId.size()))
-        return -1;
-    return mActionId[sel];
-}
-
-int TouchActionsModel::getSelectionFromAction(const int action) const
-{
-    const std::map<int, int>::const_iterator it
-        = mActionToSelection.find(action);
-    if (it == mActionToSelection.end())
-        return 0;
-    return (*it).second;
-}
+#include "utils/stringutils.h"
 
+#include "debug.h"
 
 SetupActionDropDown::SetupActionDropDown(const std::string &restrict text,
                                          const std::string &restrict
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index f15c0d43d..f7bbf2691 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -21,27 +21,9 @@
 #ifndef GUI_WIDGETS_SETUPTOUCHITEM_H
 #define GUI_WIDGETS_SETUPTOUCHITEM_H
 
-#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/setupitem.h"
 
-class TouchActionsModel final : public NamesModel
-{
-    public:
-        TouchActionsModel();
-
-        A_DELETE_COPY(TouchActionsModel)
-
-        ~TouchActionsModel()
-        { }
-
-        int getActionFromSelection(const int sel) const;
-
-        int getSelectionFromAction(const int action) const;
-
-    private:
-        std::vector<int> mActionId;
-        std::map<int, int> mActionToSelection;
-};
+class TouchActionsModel;
 
 class SetupActionDropDown final : public SetupItem
 {
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 58f9ec8eb..007dc6442 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -27,23 +27,23 @@
 
 #include "being/playerinfo.h"
 
+#include "gui/font.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/itempopup.h"
 
-#include "gui/widgets/shopitems.h"
+#include "gui/models/shopitems.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include "debug.h"
 
 const int ITEM_ICON_SIZE = 32;
 
 ShopListBox::ShopListBox(const Widget2 *const widget,
-                         gcn::ListModel *const listModel) :
+                         ListModel *const listModel) :
     ListBox(widget, listModel, "shoplistbox.xml"),
     mPlayerMoney(0),
     mShopItems(nullptr),
@@ -60,7 +60,7 @@ ShopListBox::ShopListBox(const Widget2 *const widget,
 }
 
 ShopListBox::ShopListBox(const Widget2 *const widget,
-                         gcn::ListModel *const listModel,
+                         ListModel *const listModel,
                          ShopItems *const shopListModel) :
     ListBox(widget, listModel, "shoplistbox.xml"),
     mPlayerMoney(0),
@@ -82,7 +82,7 @@ void ShopListBox::setPlayersMoney(const int money)
     mPlayerMoney = money;
 }
 
-void ShopListBox::draw(gcn::Graphics *gcnGraphics)
+void ShopListBox::draw(Graphics *graphics)
 {
     BLOCK_START("ShopListBox::draw")
     if (!mListModel || !mShopItems)
@@ -95,8 +95,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
         mAlpha = client->getGuiAlpha();
 
     const int alpha = static_cast<int>(mAlpha * 255.0F);
-    Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     const int sz = mListModel->getNumberOfElements();
     const int fontHeigh = getFont()->getHeight();
@@ -107,8 +106,8 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
          ++i, y += mRowHeight)
     {
         bool needDraw(false);
-        gcn::Color temp;
-        gcn::Color* backgroundColor = &mBackgroundColor;
+        Color temp;
+        Color* backgroundColor = &mBackgroundColor;
 
         ShopItem *const item = mShopItems->at(i);
         if (item && ((mShopItems && mPlayerMoney < item->getPrice()
@@ -145,7 +144,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
         if (needDraw)
         {
             graphics->setColor(*backgroundColor);
-            graphics->fillRectangle(gcn::Rectangle(mPadding, y + mPadding,
+            graphics->fillRectangle(Rect(mPadding, y + mPadding,
                 width, mRowHeight));
         }
 
@@ -155,7 +154,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
             if (icon)
             {
                 icon->setAlpha(1.0F);
-                graphics->drawImage2(icon, mPadding, y + mPadding);
+                graphics->drawImage(icon, mPadding, y + mPadding);
             }
         }
         if (mSelected == i)
@@ -190,7 +189,7 @@ void ShopListBox::setPriceCheck(const bool check)
     mPriceCheck = check;
 }
 
-void ShopListBox::mouseMoved(gcn::MouseEvent &event)
+void ShopListBox::mouseMoved(MouseEvent &event)
 {
     if (!mItemPopup || !mRowHeight)
         return;
@@ -222,10 +221,10 @@ void ShopListBox::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void ShopListBox::mouseReleased(gcn::MouseEvent& mouseEvent)
+void ShopListBox::mouseReleased(MouseEvent& mouseEvent)
 {
     ListBox::mouseReleased(mouseEvent);
-    if (mouseEvent.getButton() == gcn::MouseEvent::RIGHT)
+    if (mouseEvent.getButton() == MouseEvent::RIGHT)
     {
         setSelected(std::max(0, getSelectionByMouse(mouseEvent.getY())));
 
@@ -237,7 +236,7 @@ void ShopListBox::mouseReleased(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void ShopListBox::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
+void ShopListBox::mouseExited(MouseEvent& mouseEvent A_UNUSED)
 {
     if (!mItemPopup)
         return;
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 095d187eb..17c1ed4d5 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -42,13 +42,13 @@ class ShopListBox final : public ListBox
          * Constructor.
          */
         ShopListBox(const Widget2 *const widget,
-                    gcn::ListModel *const listModel);
+                    ListModel *const listModel);
 
         /**
          * Constructor with shopitems
          */
         ShopListBox(const Widget2 *const widget,
-                    gcn::ListModel *const listModel,
+                    ListModel *const listModel,
                     ShopItems *const shopListModel);
 
         A_DELETE_COPY(ShopListBox)
@@ -56,7 +56,7 @@ class ShopListBox final : public ListBox
         /**
          * Draws the list box.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * gives information about the current player's money
@@ -74,11 +74,11 @@ class ShopListBox final : public ListBox
          */
         void setPriceCheck(const bool check);
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
+        void mouseReleased(MouseEvent& mouseEvent) override final;
 
-        void mouseExited(gcn::MouseEvent& mouseEvent) override final;
+        void mouseExited(MouseEvent& mouseEvent) override final;
 
         void setProtectItems(bool p)
         { mProtectItems = p; }
@@ -94,8 +94,8 @@ class ShopListBox final : public ListBox
 
         ItemPopup *mItemPopup;
 
-        gcn::Color mBackgroundColor;
-        gcn::Color mWarningColor;
+        Color mBackgroundColor;
+        Color mWarningColor;
 
         bool mPriceCheck;
         bool mProtectItems;
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index a3030b035..0d9aa64a6 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -24,15 +24,16 @@
 
 #include "graphicsvertexes.h"
 
+#include "gui/gui.h"
+
 #include "debug.h"
 
 float ShortcutContainer::mAlpha = 1.0;
 
-ShortcutContainer::ShortcutContainer() :
-    gcn::Widget(),
-    Widget2(),
-    gcn::WidgetListener(),
-    gcn::MouseListener(),
+ShortcutContainer::ShortcutContainer(Widget2 *const widget) :
+    Widget(widget),
+    WidgetListener(),
+    MouseListener(),
     mBackgroundImg(nullptr),
     mMaxItems(0),
     mBoxWidth(1),
@@ -53,14 +54,14 @@ ShortcutContainer::~ShortcutContainer()
     mVertexes = nullptr;
 }
 
-void ShortcutContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void ShortcutContainer::widgetResized(const Event &event A_UNUSED)
 {
     mGridWidth = mDimension.width / mBoxWidth;
 
     if (mGridWidth < 1)
         mGridWidth = 1;
 
-    mGridHeight = mMaxItems / mGridWidth;
+    mGridHeight = mMaxItems / static_cast<unsigned int>(mGridWidth);
 
     if (mMaxItems % mGridWidth != 0 || mGridHeight < 1)
         ++mGridHeight;
@@ -72,7 +73,7 @@ void ShortcutContainer::widgetResized(const gcn::Event &event A_UNUSED)
 int ShortcutContainer::getIndexFromGrid(const int pointX,
                                         const int pointY) const
 {
-    const gcn::Rectangle tRect = gcn::Rectangle(0, 0,
+    const Rect tRect = Rect(0, 0,
         mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
 
     int index = ((pointY / mBoxHeight) * mGridWidth) + pointX / mBoxWidth;
@@ -109,14 +110,14 @@ void ShortcutContainer::drawBackground(Graphics *g)
         {
             for (unsigned i = 0; i < mMaxItems; i ++)
             {
-                g->drawImage2(mBackgroundImg, (i % mGridWidth) * mBoxWidth,
+                g->drawImage(mBackgroundImg, (i % mGridWidth) * mBoxWidth,
                     (i / mGridWidth) * mBoxHeight);
             }
         }
     }
 }
 
-void ShortcutContainer::widgetMoved(const gcn::Event& event A_UNUSED)
+void ShortcutContainer::widgetMoved(const Event& event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 8bd84758d..81392097b 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -23,11 +23,10 @@
 #ifndef GUI_WIDGETS_SHORTCUTCONTAINER_H
 #define GUI_WIDGETS_SHORTCUTCONTAINER_H
 
-#include "gui/widgets/widget2.h"
+#include "gui/widgets/widget.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
 
 class Image;
 class ImageCollection;
@@ -37,10 +36,9 @@ class ImageCollection;
  *
  * \ingroup GUI
  */
-class ShortcutContainer : public gcn::Widget,
-                          public Widget2,
-                          public gcn::WidgetListener,
-                          public gcn::MouseListener
+class ShortcutContainer : public Widget,
+                          public WidgetListener,
+                          public MouseListener
 {
     public:
         A_DELETE_COPY(ShortcutContainer)
@@ -53,34 +51,34 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Draws the shortcuts
          */
-        virtual void draw(gcn::Graphics *graphics) override = 0;
+        virtual void draw(Graphics *graphics) override = 0;
 
         /**
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
-        virtual void widgetResized(const gcn::Event &event) override final;
+        virtual void widgetResized(const Event &event) override final;
 
-        virtual void widgetMoved(const gcn::Event& event) override final;
+        virtual void widgetMoved(const Event& event) override final;
 
         /**
          * Handles mouse when dragged.
          */
-        virtual void mouseDragged(gcn::MouseEvent &event A_UNUSED) override
+        virtual void mouseDragged(MouseEvent &event A_UNUSED) override
         {
         }
 
         /**
          * Handles mouse when pressed.
          */
-        virtual void mousePressed(gcn::MouseEvent &event A_UNUSED) override
+        virtual void mousePressed(MouseEvent &event A_UNUSED) override
         {
         }
 
         /**
          * Handles mouse release.
          */
-        virtual void mouseReleased(gcn::MouseEvent &event A_UNUSED) override
+        virtual void mouseReleased(MouseEvent &event A_UNUSED) override
         {
         }
 
@@ -102,7 +100,7 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Constructor. Initializes the shortcut container.
          */
-        explicit ShortcutContainer();
+        explicit ShortcutContainer(Widget2 *const widget);
 
         /**
          * Gets the index from the grid provided the point is in an item box.
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 46a3f425f..a009d623a 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -27,7 +27,8 @@
 #include "gui/theme.h"
 
 #include "gui/widgets/skilldata.h"
-#include "gui/widgets/skillmodel.h"
+
+#include "gui/models/skillmodel.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index d268b3438..f9baec6cc 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SKILLINFO_H
 #define GUI_WIDGETS_SKILLINFO_H
 
-#include <guichan/color.hpp>
+#include "gui/color.h"
 
 #include <vector>
 #include <map>
@@ -43,7 +43,7 @@ struct SkillInfo final
     std::string skillLevel;
     std::string skillExp;
     float progress;
-    gcn::Color color;
+    Color color;
     SkillDataMap dataMap;
     SkillModel *model;
     SkillData *data;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 750b58528..7a9b38050 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -25,8 +25,11 @@
 #include "client.h"
 #include "graphicsvertexes.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
+
+#include "gui/gui.h"
 
 #include "resources/image.h"
 
@@ -42,9 +45,9 @@ static std::string const data[2] =
     "slider_highlighted.xml"
 };
 
-Slider::Slider(const double scaleEnd) :
-    gcn::Slider(scaleEnd),
-    Widget2(),
+Slider::Slider(Widget2 *const widget,
+               const double scaleEnd) :
+    gcn::Slider(widget, scaleEnd),
     mVertexes(new ImageCollection),
     mHasMouse(false),
     mRedraw(true)
@@ -52,9 +55,10 @@ Slider::Slider(const double scaleEnd) :
     init();
 }
 
-Slider::Slider(const double scaleStart, const double scaleEnd) :
-    gcn::Slider(scaleStart, scaleEnd),
-    Widget2(),
+Slider::Slider(Widget2 *const widget,
+               const double scaleStart,
+               const double scaleEnd) :
+    gcn::Slider(widget, scaleStart, scaleEnd),
     mVertexes(new ImageCollection),
     mHasMouse(false),
     mRedraw(true)
@@ -118,7 +122,7 @@ void Slider::updateAlpha()
     }
 }
 
-void Slider::draw(gcn::Graphics *graphics)
+void Slider::draw(Graphics *graphics)
 {
     BLOCK_START("Slider::draw")
     if (!buttons[0].grid[HSTART] || !buttons[1].grid[HSTART]
@@ -133,19 +137,18 @@ void Slider::draw(gcn::Graphics *graphics)
     int x = 0;
     const int y = mHasMouse ? (h - buttons[1].grid[HSTART]->getHeight()) / 2 :
         (h - buttons[0].grid[HSTART]->getHeight()) / 2;
-    Graphics *const g = static_cast<Graphics*>(graphics);
 
     updateAlpha();
 
     if (isBatchDrawRenders(openGLMode))
     {
-        if (mRedraw || g->getRedraw())
+        if (mRedraw || graphics->getRedraw())
         {
             mRedraw = false;
             mVertexes->clear();
             if (!mHasMouse)
             {
-                g->calcTileCollection(mVertexes,
+                graphics->calcTileCollection(mVertexes,
                     buttons[0].grid[HSTART], x, y);
 
                 const int width = buttons[0].grid[HSTART]->getWidth();
@@ -155,24 +158,31 @@ void Slider::draw(gcn::Graphics *graphics)
                 if (buttons[0].grid[HMID])
                 {
                     const Image *const hMid = buttons[0].grid[HMID];
-                    g->calcPattern(mVertexes, hMid, x, y,
+                    graphics->calcPattern(mVertexes,
+                        hMid,
+                        x, y,
                         w, hMid->getHeight());
                 }
 
                 x += w;
-                g->calcTileCollection(mVertexes, buttons[0].grid[HEND], x, y);
+                graphics->calcTileCollection(mVertexes,
+                    buttons[0].grid[HEND],
+                    x, y);
 
                 const Image *const img = buttons[0].grid[HGRIP];
                 if (img)
                 {
-                    g->calcTileCollection(mVertexes, img, getMarkerPosition(),
+                    graphics->calcTileCollection(mVertexes,
+                        img,
+                        getMarkerPosition(),
                         (mDimension.height - img->getHeight()) / 2);
                 }
             }
             else
             {
-                g->calcTileCollection(mVertexes,
-                    buttons[1].grid[HSTART], x, y);
+                graphics->calcTileCollection(mVertexes,
+                    buttons[1].grid[HSTART],
+                    x, y);
 
                 const int width = buttons[1].grid[HSTART]->getWidth();
                 w -= width;
@@ -183,32 +193,36 @@ void Slider::draw(gcn::Graphics *graphics)
                 if (buttons[1].grid[HMID])
                 {
                     const Image *const hMid = buttons[1].grid[HMID];
-                    g->calcPattern(mVertexes, hMid, x, y,
+                    graphics->calcPattern(mVertexes,
+                        hMid,
+                        x, y,
                         w, hMid->getHeight());
                 }
 
                 x += w;
                 if (buttons[1].grid[HEND])
                 {
-                    g->calcTileCollection(mVertexes,
+                    graphics->calcTileCollection(mVertexes,
                         buttons[1].grid[HEND], x, y);
                 }
 
                 const Image *const img = buttons[1].grid[HGRIP];
                 if (img)
                 {
-                    g->calcTileCollection(mVertexes, img, getMarkerPosition(),
+                    graphics->calcTileCollection(mVertexes,
+                        img,
+                        getMarkerPosition(),
                         (mDimension.height - img->getHeight()) / 2);
                 }
             }
         }
-        g->drawTileCollection(mVertexes);
+        graphics->drawTileCollection(mVertexes);
     }
     else
     {
         if (!mHasMouse)
         {
-            g->drawImage2(buttons[0].grid[HSTART], x, y);
+            graphics->drawImage(buttons[0].grid[HSTART], x, y);
             const int width = buttons[0].grid[HSTART]->getWidth();
             w -= width + buttons[0].grid[HEND]->getWidth();
             x += width;
@@ -216,22 +230,22 @@ void Slider::draw(gcn::Graphics *graphics)
             if (buttons[0].grid[HMID])
             {
                 const Image *const hMid = buttons[0].grid[HMID];
-                g->drawPattern(hMid, x, y, w, hMid->getHeight());
+                graphics->drawPattern(hMid, x, y, w, hMid->getHeight());
             }
 
             x += w;
-            g->drawImage2(buttons[0].grid[HEND], x, y);
+            graphics->drawImage(buttons[0].grid[HEND], x, y);
 
             const Image *const img = buttons[0].grid[HGRIP];
             if (img)
             {
-                g->drawImage2(img, getMarkerPosition(),
+                graphics->drawImage(img, getMarkerPosition(),
                     (mDimension.height - img->getHeight()) / 2);
             }
         }
         else
         {
-            g->drawImage2(buttons[1].grid[HSTART], x, y);
+            graphics->drawImage(buttons[1].grid[HSTART], x, y);
 
             const int width = buttons[1].grid[HSTART]->getWidth();
             w -= width;
@@ -242,17 +256,17 @@ void Slider::draw(gcn::Graphics *graphics)
             if (buttons[1].grid[HMID])
             {
                 const Image *const hMid = buttons[1].grid[HMID];
-                g->drawPattern(hMid, x, y, w, hMid->getHeight());
+                graphics->drawPattern(hMid, x, y, w, hMid->getHeight());
             }
 
             x += w;
             if (buttons[1].grid[HEND])
-                g->drawImage2(buttons[1].grid[HEND], x, y);
+                graphics->drawImage(buttons[1].grid[HEND], x, y);
 
             const Image *const img = buttons[1].grid[HGRIP];
             if (img)
             {
-                g->drawImage2(img, getMarkerPosition(),
+                graphics->drawImage(img, getMarkerPosition(),
                     (mDimension.height - img->getHeight()) / 2);
             }
         }
@@ -261,21 +275,21 @@ void Slider::draw(gcn::Graphics *graphics)
     BLOCK_END("Slider::draw")
 }
 
-void Slider::mouseEntered(gcn::MouseEvent& event A_UNUSED)
+void Slider::mouseEntered(MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
     mRedraw = true;
 }
 
-void Slider::mouseExited(gcn::MouseEvent& event A_UNUSED)
+void Slider::mouseExited(MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
     mRedraw = true;
 }
 
-void Slider::mousePressed(gcn::MouseEvent &mouseEvent)
+void Slider::mousePressed(MouseEvent &mouseEvent)
 {
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT
+    if (mouseEvent.getButton() == MouseEvent::LEFT
         && mouseEvent.getX() >= 0
         && mouseEvent.getX() <= getWidth()
         && mouseEvent.getY() >= 0
@@ -296,7 +310,7 @@ void Slider::mousePressed(gcn::MouseEvent &mouseEvent)
     }
 }
 
-void Slider::mouseDragged(gcn::MouseEvent &mouseEvent)
+void Slider::mouseDragged(MouseEvent &mouseEvent)
 {
     if (getOrientation() == HORIZONTAL)
     {
@@ -314,7 +328,7 @@ void Slider::mouseDragged(gcn::MouseEvent &mouseEvent)
     mouseEvent.consume();
 }
 
-void Slider::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent)
+void Slider::mouseWheelMovedUp(MouseEvent &mouseEvent)
 {
     setValue2(getValue() + getStepLength());
     distributeActionEvent();
@@ -322,7 +336,7 @@ void Slider::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent)
     mouseEvent.consume();
 }
 
-void Slider::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent)
+void Slider::mouseWheelMovedDown(MouseEvent &mouseEvent)
 {
     setValue2(getValue() - getStepLength());
     distributeActionEvent();
@@ -330,9 +344,9 @@ void Slider::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent)
     mouseEvent.consume();
 }
 
-void Slider::keyPressed(gcn::KeyEvent& keyEvent)
+void Slider::keyPressed(KeyEvent& keyEvent)
 {
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int action = keyEvent.getActionId();
 
     if (getOrientation() == HORIZONTAL)
     {
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index a0f7829ac..2f21127d1 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -23,9 +23,7 @@
 #ifndef GUI_WIDGETS_SLIDER_H
 #define GUI_WIDGETS_SLIDER_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/slider.hpp>
+#include "gui/base/widgets/slider.hpp"
 
 #include "localconsts.h"
 
@@ -36,19 +34,21 @@ class ImageCollection;
  *
  * \ingroup GUI
  */
-class Slider final : public gcn::Slider,
-                     public Widget2
+class Slider final : public gcn::Slider
 {
     public:
         /**
          * Constructor with scale start equal to 0.
          */
-        explicit Slider(const double scaleEnd = 1.0);
+        explicit Slider(Widget2 *const widget,
+                        const double scaleEnd = 1.0);
 
         /**
          * Constructor.
          */
-        Slider(const double scaleStart, const double scaleEnd);
+        Slider(Widget2 *const widget,
+               const double scaleStart,
+               const double scaleEnd);
 
         A_DELETE_COPY(Slider)
 
@@ -65,27 +65,27 @@ class Slider final : public gcn::Slider,
         /**
          * Draws the slider.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(gcn::MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) override final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(gcn::MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) override final;
 
-        void mousePressed(gcn::MouseEvent &mouseEvent) override final;
+        void mousePressed(MouseEvent &mouseEvent) override final;
 
-        void mouseDragged(gcn::MouseEvent &mouseEvent) override final;
+        void mouseDragged(MouseEvent &mouseEvent) override final;
 
-        void mouseWheelMovedUp(gcn::MouseEvent &mouseEvent) override final;
+        void mouseWheelMovedUp(MouseEvent &mouseEvent) override final;
 
-        void mouseWheelMovedDown(gcn::MouseEvent &mouseEvent) override final;
+        void mouseWheelMovedDown(MouseEvent &mouseEvent) override final;
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
         void setValue2(const double value);
 
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 60d7926d1..03f0c4ed2 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -20,13 +20,14 @@
 
 #include "gui/widgets/sliderlist.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/models/listmodel.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 static const int buttonWidth = 27;
@@ -34,10 +35,10 @@ static const int buttonSpace = 30;
 static const int sliderHeight = 30;
 
 SliderList::SliderList(const Widget2 *const widget,
-                       gcn::ListModel *const listModel) :
+                       ListModel *const listModel) :
     Container(widget),
-    gcn::ActionListener(),
-    gcn::MouseListener(),
+    ActionListener(),
+    MouseListener(),
     mLabel(new Label(this)),
     mListModel(listModel),
     mPrevEventId(),
@@ -48,7 +49,7 @@ SliderList::SliderList(const Widget2 *const widget,
     setHeight(sliderHeight);
 }
 
-void SliderList::postInit(gcn::ActionListener *const listener,
+void SliderList::postInit(ActionListener *const listener,
                           const std::string &eventId)
 {
     mPrevEventId = eventId + "_prev";
@@ -80,13 +81,13 @@ void SliderList::updateAlpha()
     Button::updateAlpha();
 }
 
-void SliderList::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
+void SliderList::mouseWheelMovedUp(MouseEvent& mouseEvent)
 {
     setSelected(mSelectedIndex - 1);
     mouseEvent.consume();
 }
 
-void SliderList::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
+void SliderList::mouseWheelMovedDown(MouseEvent& mouseEvent)
 {
     setSelected(mSelectedIndex + 1);
     mouseEvent.consume();
@@ -103,7 +104,7 @@ void SliderList::resize()
     updateLabel();
 }
 
-void SliderList::draw(gcn::Graphics *graphics)
+void SliderList::draw(Graphics *graphics)
 {
     BLOCK_START("SliderList::draw")
     const int width = mDimension.width;
@@ -138,7 +139,7 @@ void SliderList::updateLabel()
         mLabel->setPosition(buttonSpace + (space - labelWidth) / 2, labelY);
 }
 
-void SliderList::action(const gcn::ActionEvent &event)
+void SliderList::action(const ActionEvent &event)
 {
     if (!mListModel)
         return;
@@ -209,7 +210,7 @@ int SliderList::getMaxLabelWidth() const
         return 1;
 
     int maxWidth = 0;
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
 
     const int num = mListModel->getNumberOfElements();
     for (int f = 0; f < num; f ++)
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 73f8c6f5c..84f96ebe4 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -21,9 +21,8 @@
 #ifndef GUI_WIDGETS_SLIDERLIST_H
 #define GUI_WIDGETS_SLIDERLIST_H
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
-#include <guichan/mouselistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/mouselistener.h"
 
 #include "gui/widgets/container.h"
 
@@ -31,33 +30,34 @@
 
 class Button;
 class Label;
+class ListModel;
 
 class SliderList final : public Container,
-                         public gcn::ActionListener,
-                         public gcn::MouseListener
+                         public ActionListener,
+                         public MouseListener
 {
     public:
         SliderList(const Widget2 *const widget,
-                   gcn::ListModel *const listModel);
+                   ListModel *const listModel);
 
         A_DELETE_COPY(SliderList)
 
         ~SliderList();
 
-        void postInit(gcn::ActionListener *const listener,
+        void postInit(ActionListener *const listener,
                       const std::string &eventId);
 
         void updateAlpha();
 
-        void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
+        void mouseWheelMovedUp(MouseEvent& mouseEvent) override final;
 
-        void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
+        void mouseWheelMovedDown(MouseEvent& mouseEvent) override final;
 
         void resize();
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void setSelectedString(const std::string &str);
 
@@ -77,7 +77,7 @@ class SliderList final : public Container,
 
         Button *mButtons[2];
         Label *mLabel;
-        gcn::ListModel *mListModel;
+        ListModel *mListModel;
         std::string mPrevEventId;
         std::string mNextEventId;
         int mOldWidth;
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index bf14f21fe..ed92b62e1 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,21 +27,20 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
+#include "gui/font.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/spellpopup.h"
 
-#include "gui/windows/inventorywindow.h"
 #include "gui/windows/shortcutwindow.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
-SpellShortcutContainer::SpellShortcutContainer(const unsigned number) :
-    ShortcutContainer(),
+SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget,
+                                               const unsigned number) :
+    ShortcutContainer(widget),
     mSpellPopup(new SpellPopup),
     mNumber(number),
     mSpellClicked(false)
@@ -90,7 +89,7 @@ void SpellShortcutContainer::setWidget2(const Widget2 *const widget)
     mForegroundColor2 = getThemeColor(Theme::TEXT_OUTLINE);
 }
 
-void SpellShortcutContainer::draw(gcn::Graphics *graphics)
+void SpellShortcutContainer::draw(Graphics *graphics)
 {
     if (!spellShortcut)
         return;
@@ -103,12 +102,11 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
             mBackgroundImg->setAlpha(mAlpha);
     }
 
-    Graphics *const g = static_cast<Graphics *const>(graphics);
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
 
     const int selectedId = spellShortcut->getSelectedItem();
-    g->setColorAll(mForegroundColor, mForegroundColor2);
-    drawBackground(g);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
+    drawBackground(graphics);
 
     for (unsigned i = 0; i < mMaxItems; i++)
     {
@@ -118,7 +116,7 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
         const int itemId = getItemByIndex(i);
         if (selectedId >= 0 && itemId == selectedId)
         {
-            g->drawRectangle(gcn::Rectangle(itemX + 1, itemY + 1,
+            graphics->drawRectangle(Rect(itemX + 1, itemY + 1,
                 mBoxWidth - 1, mBoxHeight - 1));
         }
 
@@ -135,11 +133,11 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
                 if (image)
                 {
                     image->setAlpha(1.0F);
-                    g->drawImage2(image, itemX, itemY);
+                    graphics->drawImage(image, itemX, itemY);
                 }
             }
 
-            font->drawString(g, spell->getSymbol(),
+            font->drawString(graphics, spell->getSymbol(),
                 itemX + 2, itemY + mBoxHeight / 2);
         }
     }
@@ -147,9 +145,9 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
     BLOCK_END("SpellShortcutContainer::draw")
 }
 
-void SpellShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+void SpellShortcutContainer::mouseDragged(MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (dragDrop.isEmpty() && mSpellClicked)
         {
@@ -178,7 +176,7 @@ void SpellShortcutContainer::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void SpellShortcutContainer::mousePressed(gcn::MouseEvent &event)
+void SpellShortcutContainer::mousePressed(MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
 
@@ -186,16 +184,16 @@ void SpellShortcutContainer::mousePressed(gcn::MouseEvent &event)
         return;
 
     const unsigned int eventButton = event.getButton();
-    if (eventButton == gcn::MouseEvent::LEFT)
+    if (eventButton == MouseEvent::LEFT)
     {
         const int itemId = getItemByIndex(index);
         if (itemId > 0)
             mSpellClicked = true;
     }
-    else if (eventButton == gcn::MouseEvent::RIGHT)
+    else if (eventButton == MouseEvent::RIGHT)
     {
     }
-    else if (eventButton == gcn::MouseEvent::MIDDLE)
+    else if (eventButton == MouseEvent::MIDDLE)
     {
         if (!spellShortcut || !spellManager)
             return;
@@ -205,7 +203,7 @@ void SpellShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void SpellShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+void SpellShortcutContainer::mouseReleased(MouseEvent &event)
 {
     if (!spellShortcut || !spellManager)
         return;
@@ -221,7 +219,7 @@ void SpellShortcutContainer::mouseReleased(gcn::MouseEvent &event)
     const int itemId = getItemByIndex(index);
     const unsigned int eventButton = event.getButton();
 
-    if (eventButton == gcn::MouseEvent::LEFT)
+    if (eventButton == MouseEvent::LEFT)
     {
         mSpellClicked = false;
 
@@ -273,7 +271,7 @@ void SpellShortcutContainer::mouseReleased(gcn::MouseEvent &event)
             }
         }
     }
-    else if (eventButton == gcn::MouseEvent::RIGHT)
+    else if (eventButton == MouseEvent::RIGHT)
     {
         TextCommand *spell = nullptr;
         if (itemId >= 0)
@@ -285,7 +283,7 @@ void SpellShortcutContainer::mouseReleased(gcn::MouseEvent &event)
 }
 
 // Show ItemTooltip
-void SpellShortcutContainer::mouseMoved(gcn::MouseEvent &event)
+void SpellShortcutContainer::mouseMoved(MouseEvent &event)
 {
     if (!mSpellPopup || !spellShortcut || !spellManager)
         return;
@@ -309,13 +307,13 @@ void SpellShortcutContainer::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void SpellShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mSpellPopup)
         mSpellPopup->setVisible(false);
 }
 
-void SpellShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void SpellShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mSpellPopup)
         mSpellPopup->setVisible(false);
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 37e7b5660..afff6dcf9 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -38,7 +38,8 @@ class SpellShortcutContainer final : public ShortcutContainer
         /**
          * Constructor. Initializes the graphic.
          */
-        explicit SpellShortcutContainer(const unsigned number);
+        explicit SpellShortcutContainer(Widget2 *const widget,
+                                        const unsigned number);
 
         A_DELETE_COPY(SpellShortcutContainer)
 
@@ -50,28 +51,28 @@ class SpellShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
         void setWidget2(const Widget2 *const widget) override final;
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 3b0cf1db5..d2bb24720 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -20,29 +20,74 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gui/widgets/tabbedarea.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
+
+#include "gui/gui.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabs/tab.h"
 
-#include <guichan/widgets/container.hpp>
+#include "gui/base/widgets/container.hpp"
 
 #include "debug.h"
 
 TabbedArea::TabbedArea(const Widget2 *const widget) :
-    Widget2(widget),
-    gcn::ActionListener(),
-    gcn::BasicContainer(),
-    gcn::KeyListener(),
-    gcn::MouseListener(),
-    gcn::WidgetListener(),
+    ActionListener(),
+    gcn::BasicContainer(widget),
+    KeyListener(),
+    MouseListener(),
+    WidgetListener(),
     mSelectedTab(nullptr),
-    mTabContainer(new gcn::Container()),
-    mWidgetContainer(new gcn::Container()),
+    mTabContainer(new gcn::Container(widget)),
+    mWidgetContainer(new gcn::Container(widget)),
     mTabsToDelete(),
     mTabs(),
     mTabsWidth(0),
@@ -72,7 +117,7 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
 
 void TabbedArea::postInit()
 {
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
 
 TabbedArea::~TabbedArea()
@@ -139,7 +184,7 @@ Tab *TabbedArea::getTab(const std::string &name) const
     return nullptr;
 }
 
-void TabbedArea::draw(gcn::Graphics *graphics)
+void TabbedArea::draw(Graphics *graphics)
 {
     BLOCK_START("TabbedArea::draw")
     if (mTabs.empty())
@@ -152,7 +197,7 @@ void TabbedArea::draw(gcn::Graphics *graphics)
     BLOCK_END("TabbedArea::draw")
 }
 
-gcn::Widget *TabbedArea::getWidget(const std::string &name) const
+Widget *TabbedArea::getWidget(const std::string &name) const
 {
     TabContainer::const_iterator itr = mTabs.begin();
     const TabContainer::const_iterator itr_end = mTabs.end();
@@ -167,7 +212,7 @@ gcn::Widget *TabbedArea::getWidget(const std::string &name) const
     return nullptr;
 }
 
-gcn::Widget *TabbedArea::getCurrentWidget() const
+Widget *TabbedArea::getCurrentWidget() const
 {
     const Tab *const tab = getSelectedTab();
 
@@ -178,7 +223,7 @@ gcn::Widget *TabbedArea::getCurrentWidget() const
 }
 
 void TabbedArea::addTab(Tab *const tab,
-                        gcn::Widget *const widget)
+                        Widget *const widget)
 {
     if (!tab || !widget)
         return;
@@ -187,7 +232,7 @@ void TabbedArea::addTab(Tab *const tab,
     tab->addActionListener(this);
 
     mTabContainer->add(tab);
-    mTabs.push_back(std::pair<Tab*, gcn::Widget*>(tab, widget));
+    mTabs.push_back(std::pair<Tab*, Widget*>(tab, widget));
 
     if (!mSelectedTab)
         setSelectedTab(tab);
@@ -203,14 +248,14 @@ void TabbedArea::addTab(Tab *const tab,
     updateArrowEnableState();
 }
 
-void TabbedArea::adjustWidget(gcn::Widget *const widget) const
+void TabbedArea::adjustWidget(Widget *const widget) const
 {
     const int frameSize = 2 * mFrameSize;
     widget->setSize(getWidth() - frameSize,
         getHeight() - frameSize - mTabContainer->getHeight());
 }
 
-void TabbedArea::addTab(const std::string &caption, gcn::Widget *const widget)
+void TabbedArea::addTab(const std::string &caption, Widget *const widget)
 {
     Tab *const tab = new Tab(this);
     tab->setCaption(caption);
@@ -219,7 +264,7 @@ void TabbedArea::addTab(const std::string &caption, gcn::Widget *const widget)
     addTab(tab, widget);
 }
 
-void TabbedArea::addTab(Image *const image, gcn::Widget *const widget)
+void TabbedArea::addTab(Image *const image, Widget *const widget)
 {
     Tab *const tab = new Tab(this);
     tab->setImage(image);
@@ -323,14 +368,14 @@ void TabbedArea::logic()
     BLOCK_END("TabbedArea::logic")
 }
 
-void TabbedArea::mousePressed(gcn::MouseEvent &mouseEvent)
+void TabbedArea::mousePressed(MouseEvent &mouseEvent)
 {
     if (mouseEvent.isConsumed())
         return;
 
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
     {
-        gcn::Widget *const widget = mTabContainer->getWidgetAt(
+        Widget *const widget = mTabContainer->getWidgetAt(
             mouseEvent.getX(), mouseEvent.getY());
         Tab *const tab = dynamic_cast<Tab *const>(widget);
 
@@ -365,7 +410,7 @@ void TabbedArea::setSelectedTab(Tab *const tab)
     if (newTab)
         newTab->setCurrent();
 
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
 
 int TabbedArea::getSelectedTabIndex() const
@@ -392,7 +437,7 @@ void TabbedArea::setSelectedTabByName(const std::string &name)
     }
 }
 
-void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED)
+void TabbedArea::widgetResized(const Event &event A_UNUSED)
 {
     adjustSize();
 
@@ -404,7 +449,7 @@ void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED)
     const int height = h1 - frameSize
         - mWidgetContainer->getY() - widgetFrameSize;
 
-    gcn::Widget *const w = getCurrentWidget();
+    Widget *const w = getCurrentWidget();
     if (w)
     {
         ScrollArea *const scr = dynamic_cast<ScrollArea *const>(w);
@@ -412,7 +457,7 @@ void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED)
         {
             if (mFollowDownScroll && height != 0)
             {
-                const gcn::Rectangle &rect = w->getDimension();
+                const Rect &rect = w->getDimension();
                 if (rect.height != 0 && rect.height > height + 2)
                 {
                     if (scr->getVerticalScrollAmount()
@@ -500,7 +545,7 @@ void TabbedArea::adjustSize()
 
     mWidgetContainer->setPosition(0, maxTabHeight);
     mWidgetContainer->setSize(width, height - maxTabHeight);
-    gcn::Widget *const w = getCurrentWidget();
+    Widget *const w = getCurrentWidget();
     if (w)
     {
         const int wFrameSize = w->getFrameSize();
@@ -558,9 +603,9 @@ void TabbedArea::adjustTabPositions()
     }
 }
 
-void TabbedArea::action(const gcn::ActionEvent& actionEvent)
+void TabbedArea::action(const ActionEvent& actionEvent)
 {
-    gcn::Widget *const source = actionEvent.getSource();
+    Widget *const source = actionEvent.getSource();
     Tab *const tab = dynamic_cast<Tab *const>(source);
 
     if (tab)
@@ -632,7 +677,7 @@ Tab *TabbedArea::getTabByIndex(const int index) const
     return static_cast<Tab*>(mTabs[index].first);
 }
 
-gcn::Widget *TabbedArea::getWidgetByIndex(const int index) const
+Widget *TabbedArea::getWidgetByIndex(const int index) const
 {
     if (index < 0 || index >= static_cast<int>(mTabs.size()))
         return nullptr;
@@ -649,7 +694,7 @@ void TabbedArea::removeAll(const bool del)
     {
         const int idx = getNumberOfTabs() - 1;
         Tab *tab = mTabs[idx].first;
-        gcn::Widget *widget = mTabs[idx].second;
+        Widget *widget = mTabs[idx].second;
         removeTab(tab);
         if (del)
         {
@@ -661,34 +706,34 @@ void TabbedArea::removeAll(const bool del)
 
 void TabbedArea::setWidth(int width)
 {
-    gcn::Widget::setWidth(width);
+    Widget::setWidth(width);
     adjustSize();
 }
 
 void TabbedArea::setHeight(int height)
 {
-    gcn::Widget::setHeight(height);
+    Widget::setHeight(height);
     adjustSize();
 }
 
 void TabbedArea::setSize(int width, int height)
 {
-    gcn::Widget::setSize(width, height);
+    Widget::setSize(width, height);
     adjustSize();
 }
 
-void TabbedArea::setDimension(const gcn::Rectangle &dimension)
+void TabbedArea::setDimension(const Rect &dimension)
 {
-    gcn::Widget::setDimension(dimension);
+    Widget::setDimension(dimension);
     adjustSize();
 }
 
-void TabbedArea::keyPressed(gcn::KeyEvent& keyEvent)
+void TabbedArea::keyPressed(KeyEvent& keyEvent)
 {
     if (mBlockSwitching || keyEvent.isConsumed() || !isFocused())
         return;
 
-    const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
 
     if (actionId == Input::KEY_GUI_LEFT)
     {
@@ -716,7 +761,7 @@ void TabbedArea::keyPressed(gcn::KeyEvent& keyEvent)
     }
 }
 
-void TabbedArea::death(const gcn::Event &event)
+void TabbedArea::death(const Event &event)
 {
     Tab *const tab = dynamic_cast<Tab*>(event.getSource());
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index d0f97b688..dbaa4334b 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -20,16 +20,59 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef GUI_WIDGETS_TABBEDAREA_H
 #define GUI_WIDGETS_TABBEDAREA_H
 
-#include "gui/widgets/widget2.h"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
+
+#include "gui/base/widgets/container.hpp"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
-#include <guichan/widgets/container.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class Image;
@@ -38,12 +81,11 @@ class Tab;
 /**
  * A tabbed area, the same as the guichan tabbed area in 0.8, but extended
  */
-class TabbedArea final : public Widget2,
-                         public gcn::ActionListener,
+class TabbedArea final : public ActionListener,
                          public gcn::BasicContainer,
-                         public gcn::KeyListener,
-                         public gcn::MouseListener,
-                         public gcn::WidgetListener
+                         public KeyListener,
+                         public MouseListener,
+                         public WidgetListener
 {
     public:
         /**
@@ -60,7 +102,7 @@ class TabbedArea final : public Widget2,
         /**
          * Draw the tabbed area.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Return how many tabs have been created.
@@ -76,17 +118,17 @@ class TabbedArea final : public Widget2,
 
         Tab *getTabByIndex(const int index) const A_WARN_UNUSED;
 
-        gcn::Widget *getWidgetByIndex(const int index) const A_WARN_UNUSED;
+        Widget *getWidgetByIndex(const int index) const A_WARN_UNUSED;
 
         /**
          * Returns the widget with the tab that has specified caption
          */
-        gcn::Widget *getWidget(const std::string &name) const A_WARN_UNUSED;
+        Widget *getWidget(const std::string &name) const A_WARN_UNUSED;
 
         /**
          * Returns the widget for the current tab
          */
-        gcn::Widget *getCurrentWidget() const A_WARN_UNUSED;
+        Widget *getCurrentWidget() const A_WARN_UNUSED;
 
         /**
          * Add a tab. Overridden since it needs to size the widget.
@@ -94,11 +136,11 @@ class TabbedArea final : public Widget2,
          * @param tab The tab widget for the tab.
          * @param widget The widget to view when the tab is selected.
          */
-        void addTab(Tab *const tab, gcn::Widget *const widget);
+        void addTab(Tab *const tab, Widget *const widget);
 
-        void addTab(const std::string &caption, gcn::Widget *const widget);
+        void addTab(const std::string &caption, Widget *const widget);
 
-        void addTab(Image *const image, gcn::Widget *const widget);
+        void addTab(Image *const image, Widget *const widget);
 
         bool isTabSelected(const unsigned int index) const A_WARN_UNUSED;
 
@@ -140,7 +182,7 @@ class TabbedArea final : public Widget2,
 
         void setSelectedTabByName(const std::string &name);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
 /*
         void moveLeft(Tab *tab);
@@ -149,11 +191,11 @@ class TabbedArea final : public Widget2,
 */
         void adjustTabPositions();
 
-        void action(const gcn::ActionEvent& actionEvent) override final;
+        void action(const ActionEvent& actionEvent) override final;
 
         // Inherited from MouseListener
 
-        void mousePressed(gcn::MouseEvent &mouseEvent) override final;
+        void mousePressed(MouseEvent &mouseEvent) override final;
 
         void enableScrollButtons(const bool enable);
 
@@ -169,7 +211,7 @@ class TabbedArea final : public Widget2,
         bool getFollowDownScroll() const A_WARN_UNUSED
         { return mFollowDownScroll; }
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
         void setBlockSwitching(const bool b)
         { mBlockSwitching = b; }
@@ -180,21 +222,21 @@ class TabbedArea final : public Widget2,
 
         void setSize(int width, int height);
 
-        void setDimension(const gcn::Rectangle &dimension);
+        void setDimension(const Rect &dimension);
 
-        void death(const gcn::Event &event);
+        void death(const Event &event);
 
         void setResizeHeight(bool b)
         { mResizeHeight = b; }
 
-        void adjustWidget(gcn::Widget *const widget) const;
+        void adjustWidget(Widget *const widget) const;
 
         void selectNextTab();
 
         void selectPrevTab();
 
     private:
-        typedef std::vector <std::pair<Tab*, gcn::Widget*> > TabContainer;
+        typedef std::vector <std::pair<Tab*, Widget*> > TabContainer;
 
         /** The tab arrows */
         Button *mArrowButton[2];
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index 331101209..fe979ae5a 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -24,6 +24,7 @@
 
 #include "chatlogger.h"
 #include "client.h"
+#include "commands.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "soundconsts.h"
@@ -50,12 +51,13 @@
 
 static const unsigned int MAX_WORD_SIZE = 50;
 
-ChatTab::ChatTab(const Widget2 *const widget, const std::string &name,
+ChatTab::ChatTab(const Widget2 *const widget,
+                 const std::string &name,
                  const std::string &channel) :
     Tab(widget),
     mTextOutput(new BrowserBox(this, BrowserBox::AUTO_WRAP, true,
        "browserbox.xml")),
-    mScrollArea(new ScrollArea(mTextOutput, false)),
+    mScrollArea(new ScrollArea(this, mTextOutput, false)),
     mChannelName(channel),
     mAllowHightlight(true),
     mRemoveNames(false),
@@ -405,7 +407,7 @@ void ChatTab::chatInput(const std::string &message)
 void ChatTab::scroll(const int amount)
 {
     const int range = mScrollArea->getHeight() / 8 * amount;
-    gcn::Rectangle scr;
+    Rect scr;
     scr.y = mScrollArea->getVerticalScrollAmount() + range;
     scr.height = abs(range);
     mTextOutput->showPart(scr);
diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h
index 651e69d6b..a46279483 100644
--- a/src/gui/widgets/tabs/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -58,7 +58,8 @@ class ChatTab : public Tab
         /**
          * Constructor.
          */
-        ChatTab(const Widget2 *const widget, const std::string &name,
+        ChatTab(const Widget2 *const widget,
+                const std::string &name,
                 const std::string &channel);
 
         A_DELETE_COPY(ChatTab)
diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h
index fbfd3a032..cfcf901ca 100644
--- a/src/gui/widgets/tabs/guildchattab.h
+++ b/src/gui/widgets/tabs/guildchattab.h
@@ -28,7 +28,8 @@
 /**
  * A tab for a guild chat channel.
  */
-class GuildChatTab final : public ChatTab, public ConfigListener
+class GuildChatTab final : public ChatTab,
+                           public ConfigListener
 {
     public:
         explicit GuildChatTab(const Widget2 *const widget);
diff --git a/src/gui/widgets/tabs/langtab.cpp b/src/gui/widgets/tabs/langtab.cpp
index fb6a5e12b..f5064be8c 100644
--- a/src/gui/widgets/tabs/langtab.cpp
+++ b/src/gui/widgets/tabs/langtab.cpp
@@ -26,7 +26,8 @@
 
 #include "debug.h"
 
-LangTab::LangTab(const Widget2 *const widget, const std::string &lang) :
+LangTab::LangTab(const Widget2 *const widget,
+                 const std::string &lang) :
     // TRANSLATORS: lang chat tab name
     ChatTab(widget, _("Lang"), lang + " ")
 {
diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h
index 275b69399..e036e4dd8 100644
--- a/src/gui/widgets/tabs/langtab.h
+++ b/src/gui/widgets/tabs/langtab.h
@@ -26,7 +26,8 @@
 class LangTab final : public ChatTab
 {
     public:
-        LangTab(const Widget2 *const widget, const std::string &lang);
+        LangTab(const Widget2 *const widget,
+                const std::string &lang);
 
         A_DELETE_COPY(LangTab)
 
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index 1bb119ee4..6cf675635 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -30,28 +30,15 @@
 
 #include "gui/viewport.h"
 
+#include "gui/models/soundsmodel.h"
+
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "utils/gettext.h"
 
 #include "debug.h"
 
-class SoundsModel final : public NamesModel
-{
-public:
-    SoundsModel() :
-        NamesModel()
-    {
-        mNames.push_back(gettext("(no sound)"));
-        Theme::fillSoundsList(mNames);
-    }
-
-    ~SoundsModel()
-    { }
-};
-
 Setup_Audio::Setup_Audio(const Widget2 *const widget) :
     SetupTabScroll(widget),
     mSoundModel(new SoundsModel),
@@ -168,7 +155,7 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) :
     new SetupItemCheckBox(_("Download music"), "",
         "download-music", this, "download-musicEvent");
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 Setup_Audio::~Setup_Audio()
diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index 839734b39..b3736e814 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -25,6 +25,8 @@
 
 #include "gui/widgets/setupitem.h"
 
+#include "gui/widgets/tabs/setuptabscroll.h"
+
 class Setup_Audio final : public SetupTabScroll
 {
     public:
@@ -37,7 +39,7 @@ class Setup_Audio final : public SetupTabScroll
         void apply() override final;
 
     private:
-        gcn::ListModel *mSoundModel;
+        ListModel *mSoundModel;
 
         SetupItemNames *mChannelsList;
 };
diff --git a/src/gui/widgets/tabs/setup_chat.cpp b/src/gui/widgets/tabs/setup_chat.cpp
index 3aa6d39d2..7ac88ab0a 100644
--- a/src/gui/widgets/tabs/setup_chat.cpp
+++ b/src/gui/widgets/tabs/setup_chat.cpp
@@ -195,7 +195,7 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) :
     new SetupItemCheckBox(_("Show motd server message on start"), "",
         "showmotd", this, "showmotdEvent");
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 void Setup_Chat::apply()
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 1094f5e29..ac6bf2837 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -21,7 +21,8 @@
 
 #include "gui/widgets/tabs/setup_colors.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 #include "gui/userpalette.h"
 
 #include "gui/widgets/browserbox.h"
@@ -47,34 +48,35 @@ const char *const Setup_Colors::rawmsg =
 
 Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     SetupTab(widget),
-    gcn::SelectionListener(),
+    SelectionListener(),
     mColorBox(new ListBox(this, userPalette, "")),
-    mScroll(new ScrollArea(mColorBox, true, "setup_colors_background.xml")),
+    mScroll(new ScrollArea(this, mColorBox,
+        true, "setup_colors_background.xml")),
     mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP, true,
         "browserbox.xml")),
     mTextPreview(new TextPreview(this, gettext(rawmsg))),
-    mPreviewBox(new ScrollArea(mPreview, true,
+    mPreviewBox(new ScrollArea(this, mPreview, true,
         "setup_colors_preview_background.xml")),
     mSelected(-1),
     // TRANSLATORS: colors tab. label.
     mGradTypeLabel(new Label(this, _("Type:"))),
-    mGradTypeSlider(new Slider(0, 3)),
+    mGradTypeSlider(new Slider(this, 0, 3)),
     mGradTypeText(new Label(this)),
     // TRANSLATORS: colors tab. label.
     mGradDelayLabel(new Label(this, _("Delay:"))),
-    mGradDelaySlider(new Slider(20, 100)),
+    mGradDelaySlider(new Slider(this, 20, 100)),
     mGradDelayText(new TextField(this)),
     // TRANSLATORS: colors tab. label.
     mRedLabel(new Label(this, _("Red:"))),
-    mRedSlider(new Slider(0, 255)),
+    mRedSlider(new Slider(this, 0, 255)),
     mRedText(new TextField(this)),
     // TRANSLATORS: colors tab. label.
     mGreenLabel(new Label(this, _("Green:"))),
-    mGreenSlider(new Slider(0, 255)),
+    mGreenSlider(new Slider(this, 0, 255)),
     mGreenText(new TextField(this)),
     // TRANSLATORS: colors tab. label.
     mBlueLabel(new Label(this, _("Blue:"))),
-    mBlueSlider(new Slider(0, 255)),
+    mBlueSlider(new Slider(this, 0, 255)),
     mBlueText(new TextField(this))
 {
     mColorBox->postInit();
@@ -101,7 +103,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     // TRANSLATORS: color type
     std::string longText = _("Static");
 
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     if (getFont()->getWidth(_("Pulse")) > font->getWidth(longText))
     {
         // TRANSLATORS: color type
@@ -190,7 +192,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
 
     mGradTypeText->setCaption("");
 
-    setDimension(gcn::Rectangle(0, 0, 365, 350));
+    setDimension(Rect(0, 0, 365, 350));
 }
 
 Setup_Colors::~Setup_Colors()
@@ -207,7 +209,7 @@ Setup_Colors::~Setup_Colors()
     }
 }
 
-void Setup_Colors::action(const gcn::ActionEvent &event)
+void Setup_Colors::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "slider_grad")
@@ -244,14 +246,14 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
     }
 }
 
-void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
+void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
 {
     if (!userPalette)
         return;
 
     mSelected = mColorBox->getSelected();
     const int type = userPalette->getColorTypeAt(mSelected);
-    const gcn::Color *col = &userPalette->getColor(type);
+    const Color *col = &userPalette->getColor(type);
     const Palette::GradientType grad = userPalette->getGradientType(type);
     const int delay = userPalette->getGradientDelay(type);
 
@@ -381,7 +383,7 @@ void Setup_Colors::cancel()
 
     userPalette->rollback();
     const int type = userPalette->getColorTypeAt(mSelected);
-    const gcn::Color *const col = &userPalette->getColor(type);
+    const Color *const col = &userPalette->getColor(type);
     mGradTypeSlider->setValue2(userPalette->getGradientType(type));
     const int delay = userPalette->getGradientDelay(type);
     setEntry(mGradDelaySlider, mGradDelayText, delay);
@@ -442,7 +444,7 @@ void Setup_Colors::updateColor()
     }
     else if (grad == Palette::PULSE)
     {
-        userPalette->setTestColor(type, gcn::Color(
+        userPalette->setTestColor(type, Color(
                 static_cast<int>(mRedSlider->getValue()),
                 static_cast<int>(mGreenSlider->getValue()),
                 static_cast<int>(mBlueSlider->getValue())));
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index b2f860415..ce491706c 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -24,9 +24,7 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include <guichan/selectionlistener.hpp>
-
-#include <string>
+#include "listeners/selectionlistener.h"
 
 class BrowserBox;
 class Label;
@@ -37,7 +35,7 @@ class TextField;
 class TextPreview;
 
 class Setup_Colors final : public SetupTab,
-                           public gcn::SelectionListener
+                           public SelectionListener
 {
     public:
         explicit Setup_Colors(const Widget2 *const widget);
@@ -50,9 +48,9 @@ class Setup_Colors final : public SetupTab,
 
         void cancel() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
     private:
         static const char *const rawmsg;
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 9ce6fd616..b04937881 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -28,6 +28,7 @@
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
 
+#include "gui/gui.h"
 #include "gui/setupactiondata.h"
 
 #include "gui/windows/okdialog.h"
@@ -38,7 +39,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabstrip.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include "debug.h"
 
@@ -50,7 +51,7 @@ static const int setupGroups = 9;
  *
  * \ingroup Interface
  */
-class KeyListModel final : public gcn::ListModel
+class KeyListModel final : public ListModel
 {
     public:
         KeyListModel() :
@@ -103,7 +104,8 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     // TRANSLATORS: button in input settings tab
     mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys", this)),
     mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10)),
-    mScrollArea(new ScrollArea(mKeyList, true, "setup_input_background.xml")),
+    mScrollArea(new ScrollArea(this, mKeyList,
+        true, "setup_input_background.xml")),
     mKeySetting(false),
     mActionDataSize(new int [9])
 {
@@ -125,7 +127,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     mKeyListModel->setSize(mActionDataSize[0]);
     refreshKeys();
     if (gui)
-        mKeyList->setFont(reinterpret_cast<gcn::Font*>(gui->getHelpFont()));
+        mKeyList->setFont(gui->getHelpFont());
     mKeyList->addActionListener(this);
 
     mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
@@ -162,7 +164,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     if (config.getIntValue("screenwidth") >= 730)
         width += 100;
 
-    setDimension(gcn::Rectangle(0, 0, width, 350));
+    setDimension(Rect(0, 0, width, 350));
 }
 
 Setup_Input::~Setup_Input()
@@ -213,7 +215,7 @@ void Setup_Input::cancel()
     refreshKeys();
 }
 
-void Setup_Input::action(const gcn::ActionEvent &event)
+void Setup_Input::action(const ActionEvent &event)
 {
     const std::string id = event.getId();
 
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index 135cb3339..43ec53b56 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -55,7 +55,7 @@ class Setup_Input final : public SetupTab
 
         void cancel() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Get an update on the assigned key.
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index 6f023a488..b3d7b78b9 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -26,12 +26,13 @@
 
 #include "input/joystick.h"
 
+#include "gui/models/namesmodel.h"
+
 #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 "utils/gettext.h"
 
@@ -93,7 +94,7 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
     place(0, 4, mCalibrateLabel);
     place(0, 5, mCalibrateButton);
 
-    setDimension(gcn::Rectangle(0, 0, 365, 75));
+    setDimension(Rect(0, 0, 365, 75));
 }
 
 Setup_Joystick::~Setup_Joystick()
@@ -102,9 +103,9 @@ Setup_Joystick::~Setup_Joystick()
     mNamesModel = nullptr;
 }
 
-void Setup_Joystick::action(const gcn::ActionEvent &event)
+void Setup_Joystick::action(const ActionEvent &event)
 {
-    const gcn::Widget *const source = event.getSource();
+    const Widget *const source = event.getSource();
     if (source == mJoystickEnabled)
     {
         setTempEnabled(mJoystickEnabled->isSelected());
diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index 5c7b764ec..ac6caef24 100644
--- a/src/gui/widgets/tabs/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -44,7 +44,7 @@ class Setup_Joystick final : public SetupTab
 
         void cancel() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void setTempEnabled(const bool sel);
 
diff --git a/src/gui/widgets/tabs/setup_mods.cpp b/src/gui/widgets/tabs/setup_mods.cpp
index ada0ef686..b30b84c16 100644
--- a/src/gui/widgets/tabs/setup_mods.cpp
+++ b/src/gui/widgets/tabs/setup_mods.cpp
@@ -44,7 +44,7 @@ Setup_Mods::Setup_Mods(const Widget2 *const widget) :
     ContainerPlacer place = h.getPlacer(0, 0);
     place(0, 0, mScroll, 10, 10);
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 Setup_Mods::~Setup_Mods()
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 985baa744..e4801506c 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -22,8 +22,9 @@
 
 #include "gui/widgets/tabs/setup_other.h"
 
+#include "gui/models/namesmodel.h"
+
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/setupitem.h"
 #include "gui/widgets/scrollarea.h"
 
@@ -390,7 +391,7 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
     new SetupItemDropDown(_("Screen density override"), "",
         "screenDensity", this, "screenDensityEvent", mDensityList, 100);
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 Setup_Other::~Setup_Other()
diff --git a/src/gui/widgets/tabs/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp
index 271501e38..5a0566ec2 100644
--- a/src/gui/widgets/tabs/setup_perfomance.cpp
+++ b/src/gui/widgets/tabs/setup_perfomance.cpp
@@ -22,8 +22,9 @@
 
 #include "gui/widgets/tabs/setup_perfomance.h"
 
+#include "gui/models/namesmodel.h"
+
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/setupitem.h"
 
@@ -153,7 +154,7 @@ Setup_Perfomance::Setup_Perfomance(const Widget2 *const widget) :
         "", "uselonglivesounds", this,
         "uselonglivesoundsEvent");
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 Setup_Perfomance::~Setup_Perfomance()
diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp
index d4f29fa2c..01bb60f53 100644
--- a/src/gui/widgets/tabs/setup_players.cpp
+++ b/src/gui/widgets/tabs/setup_players.cpp
@@ -100,5 +100,5 @@ Setup_Players::Setup_Players(const Widget2 *const widget) :
     new SetupItemCheckBox(_("Use special diagonal speed in players moving"),
         "", "useDiagonalSpeed", this, "useDiagonalSpeedEvent");
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 89d1f5beb..1458ecd25 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -26,6 +26,9 @@
 
 #include "being/localplayer.h"
 
+#include "gui/models/ignorechoiceslistmodel.h"
+#include "gui/models/playerrelationlistmodel.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
@@ -60,43 +63,6 @@ static const char *const table_titles[COLUMNS_NR] =
     N_("Relation")
 };
 
-static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
-{
-    // TRANSLATORS: relation type
-    N_("Neutral"),
-    // TRANSLATORS: relation type
-    N_("Friend"),
-    // TRANSLATORS: relation type
-    N_("Disregarded"),
-    // TRANSLATORS: relation type
-    N_("Ignored"),
-    // TRANSLATORS: relation type
-    N_("Erased"),
-    // TRANSLATORS: relation type
-    N_("Blacklisted"),
-    // TRANSLATORS: relation type
-    N_("Enemy")
-};
-
-class PlayerRelationListModel final : public gcn::ListModel
-{
-public:
-    ~PlayerRelationListModel()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return PlayerRelation::RELATIONS_NR;
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "";
-        return gettext(RELATION_NAMES[i]);
-    }
-};
-
 class PlayerTableModel final : public Widget2, public TableModel
 {
 public:
@@ -165,7 +131,7 @@ public:
              player_names->size()); r < sz; ++r)
         {
             const std::string name = (*player_names)[r];
-            gcn::Widget *const widget = new Label(this, name);
+            Widget *const widget = new Label(this, name);
             mWidgets.push_back(widget);
 
             DropDown *const choicebox = new DropDown(this, mListModel);
@@ -186,7 +152,7 @@ public:
     }
 
 
-    gcn::Widget *getElementAt(int row, int column) const override final
+    Widget *getElementAt(int row, int column) const override final
     {
         return mWidgets[WIDGET_AT(row, column)];
     }
@@ -209,35 +175,10 @@ public:
 
 protected:
     StringVect *mPlayers;
-    std::vector<gcn::Widget *> mWidgets;
+    std::vector<Widget *> mWidgets;
     PlayerRelationListModel *mListModel;
 };
 
-/**
- * Class for choosing one of the various `what to do when ignoring a player' options
- */
-class IgnoreChoicesListModel final : public gcn::ListModel
-{
-public:
-    ~IgnoreChoicesListModel()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
-                                ->size());
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-
-        return (*player_relations.getPlayerIgnoreStrategies())
-            [i]->mDescription;
-    }
-};
-
 static const std::string ACTION_DELETE("delete");
 static const std::string ACTION_TABLE("table");
 static const std::string ACTION_STRATEGY("strategy");
@@ -249,7 +190,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
     mPlayerTableModel(new PlayerTableModel(this)),
     mPlayerTable(new GuiTable(this, mPlayerTableModel)),
     mPlayerTitleTable(new GuiTable(this, mPlayerTableTitleModel)),
-    mPlayerScrollArea(new ScrollArea(mPlayerTable)),
+    mPlayerScrollArea(new ScrollArea(this, mPlayerTable)),
     // TRANSLATORS: relation dialog button
     mDefaultTrading(new CheckBox(this, _("Allow trading"),
         player_relations.getDefault() & PlayerRelation::TRADE)),
@@ -319,7 +260,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
 
     player_relations.addListener(this);
 
-    setDimension(gcn::Rectangle(0, 0, 500, 350));
+    setDimension(Rect(0, 0, 500, 350));
 }
 
 Setup_Relations::~Setup_Relations()
@@ -370,7 +311,7 @@ void Setup_Relations::cancel()
 {
 }
 
-void Setup_Relations::action(const gcn::ActionEvent &event)
+void Setup_Relations::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == ACTION_TABLE)
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index c9d8e50a3..9fc197ffc 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -27,19 +27,17 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
+#include "listeners/playerrelationslistener.h"
+
 class Button;
 class CheckBox;
 class DropDown;
 class GuiTable;
+class ListModel;
 class PlayerTableModel;
 class ScrollArea;
 class StaticTableModel;
 
-namespace gcn
-{
-    class ListModel;
-}
-
 class Setup_Relations final : public SetupTab,
                               public PlayerRelationsListener
 {
@@ -56,7 +54,7 @@ public:
 
     void reset();
 
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
     void updatedPlayer(const std::string &name);
 
@@ -76,7 +74,7 @@ private:
 
     Button *mDeleteButton;
 
-    gcn::ListModel *mIgnoreActionChoicesModel;
+    ListModel *mIgnoreActionChoicesModel;
     DropDown *mIgnoreActionChoicesBox;
 };
 
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index d7cc4b4df..424828694 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -22,14 +22,18 @@
 
 #include "gui/widgets/tabs/setup_theme.h"
 
+#include "gui/gui.h"
+
 #include "gui/windows/okdialog.h"
 
+#include "gui/models/extendedlistmodel.h"
+#include "gui/models/fontsmodel.h"
+#include "gui/models/themesmodel.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
-#include "gui/widgets/extendedlistmodel.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
 
 #include "configuration.h"
 
@@ -51,31 +55,6 @@ const char* ACTION_JAPAN_FONT = "japanese font";
 const char* ACTION_CHINA_FONT = "chinese font";
 const char* ACTION_INFO = "info";
 
-class ThemesModel final : public NamesModel
-{
-public:
-    ThemesModel() :
-        NamesModel()
-    {
-        mNames.push_back(gettext("(default)"));
-        Theme::fillSkinsList(mNames);
-    }
-
-    ~ThemesModel()
-    { }
-};
-
-class FontsModel final : public NamesModel
-{
-public:
-    FontsModel() :
-        NamesModel()
-    { Theme::fillFontsList(mNames); }
-
-    ~FontsModel()
-    { }
-};
-
 const int maxFontSizes = 16;
 
 const char *SIZE_NAME[maxFontSizes] =
@@ -114,7 +93,7 @@ const char *SIZE_NAME[maxFontSizes] =
     N_("Huge (23)"),
 };
 
-class FontSizeChoiceListModel final : public gcn::ListModel
+class FontSizeChoiceListModel final : public ListModel
 {
 public:
     ~FontSizeChoiceListModel()
@@ -387,7 +366,7 @@ Setup_Theme::Setup_Theme(const Widget2 *const widget) :
     else if (size > maxWidth)
         size = maxWidth;
 
-    setDimension(gcn::Rectangle(0, 0, size, 500));
+    setDimension(Rect(0, 0, size, 500));
 }
 
 Setup_Theme::~Setup_Theme()
@@ -433,7 +412,7 @@ void Setup_Theme::updateInfo()
     mInfoButton->setEnabled(!mThemeInfo.empty());
 }
 
-void Setup_Theme::action(const gcn::ActionEvent &event)
+void Setup_Theme::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == ACTION_THEME)
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index a7f3ad101..5e8fe7c2a 100644
--- a/src/gui/widgets/tabs/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -46,7 +46,7 @@ class Setup_Theme final : public SetupTab
 
         void cancel() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void updateInfo();
 
diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp
index 5d995f914..fb50ab4d5 100644
--- a/src/gui/widgets/tabs/setup_touch.cpp
+++ b/src/gui/widgets/tabs/setup_touch.cpp
@@ -20,7 +20,11 @@
 
 #include "gui/widgets/tabs/setup_touch.h"
 
+#include "gui/models/namesmodel.h"
+#include "gui/models/touchactionmodel.h"
+
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/setuptouchitem.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "utils/gettext.h"
@@ -117,7 +121,7 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
             key, this, event, mActionsList, 250);
     }
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 Setup_Touch::~Setup_Touch()
diff --git a/src/gui/widgets/tabs/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h
index 9adc2d5cd..ef1afdda3 100644
--- a/src/gui/widgets/tabs/setup_touch.h
+++ b/src/gui/widgets/tabs/setup_touch.h
@@ -21,7 +21,10 @@
 #ifndef GUI_WIDGETS_TABS_SETUP_TOUCH_H
 #define GUI_WIDGETS_TABS_SETUP_TOUCH_H
 
-#include "gui/widgets/setuptouchitem.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
+
+class NamesModel;
+class TouchActionsModel;
 
 class Setup_Touch final : public SetupTabScroll
 {
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 45ada01df..f55dceaa4 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -46,7 +46,7 @@
 
 #include "test/testmain.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/models/listmodel.h"
 
 #include <algorithm>
 
@@ -54,7 +54,7 @@
 
 extern Graphics *mainGraphics;
 
-class ModeListModel final : public gcn::ListModel
+class ModeListModel final : public ListModel
 {
     public:
         ModeListModel();
@@ -159,7 +159,7 @@ int ModeListModel::getIndexOf(const std::string &widthXHeightMode)
     return -1;
 }
 
-class OpenGLListModel final : public gcn::ListModel
+class OpenGLListModel final : public ListModel
 {
 public:
     ~OpenGLListModel()
@@ -178,7 +178,7 @@ public:
 
 Setup_Video::Setup_Video(const Widget2 *const widget) :
     SetupTab(widget),
-    gcn::KeyListener(),
+    KeyListener(),
     mFullScreenEnabled(config.getBoolValue("screen")),
     mOpenGLEnabled(intToRenderType(config.getIntValue("opengl"))),
     mFps(config.getIntValue("fpslimit")),
@@ -191,9 +191,9 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     mOpenGLDropDown(new DropDown(widget, mOpenGLListModel)),
     // TRANSLATORS: video settings checkbox
     mFpsCheckBox(new CheckBox(this, _("FPS limit:"))),
-    mFpsSlider(new Slider(2, 160)),
+    mFpsSlider(new Slider(this, 2, 160)),
     mFpsLabel(new Label(this)),
-    mAltFpsSlider(new Slider(2, 160)),
+    mAltFpsSlider(new Slider(this, 2, 160)),
     // TRANSLATORS: video settings label
     mAltFpsLabel(new Label(this, _("Alt FPS limit: "))),
 #if !defined(ANDROID) && !defined(__APPLE__)
@@ -224,7 +224,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     // TRANSLATORS: video settings tab name
     setName(_("Video"));
 
-    ScrollArea *const scrollArea = new ScrollArea(mModeList,
+    ScrollArea *const scrollArea = new ScrollArea(this, mModeList,
         true, "setup_video_background.xml");
     scrollArea->setWidth(150);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -304,7 +304,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     if (config.getIntValue("screenwidth") >= 730)
         width += 100;
 
-    setDimension(gcn::Rectangle(0, 0, width, 300));
+    setDimension(Rect(0, 0, width, 300));
 }
 
 Setup_Video::~Setup_Video()
@@ -445,7 +445,7 @@ void Setup_Video::cancel()
     config.setValue("noframe", mNoFrame);
 }
 
-void Setup_Video::action(const gcn::ActionEvent &event)
+void Setup_Video::action(const ActionEvent &event)
 {
     const std::string &id = event.getId();
 
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index 22d55c121..250fac0e0 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include <guichan/keylistener.hpp>
+#include "listeners/keylistener.h"
 
 class Button;
 class CheckBox;
@@ -37,7 +37,8 @@ class OpenGLListModel;
 class Slider;
 class TextDialog;
 
-class Setup_Video final : public SetupTab, public gcn::KeyListener
+class Setup_Video final : public SetupTab,
+                          public KeyListener
 {
     public:
         explicit Setup_Video(const Widget2 *const widget);
@@ -50,7 +51,7 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
 
         void cancel() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
     private:
         bool mFullScreenEnabled;
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index ac608f756..9666b224a 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -21,8 +21,9 @@
 
 #include "gui/widgets/tabs/setup_visual.h"
 
+#include "gui/models/namesmodel.h"
+
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "client.h"
@@ -202,7 +203,7 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
     new SetupItemCheckBox(_("Allow screensaver to run"),
         "", "allowscreensaver", this, "allowscreensaverEvent");
 
-    setDimension(gcn::Rectangle(0, 0, 550, 350));
+    setDimension(Rect(0, 0, 550, 350));
 }
 
 Setup_Visual::~Setup_Visual()
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 2d40d3a08..1229757dd 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -24,6 +24,8 @@
 
 #include "gui/widgets/setupitem.h"
 
+#include "gui/widgets/tabs/setuptabscroll.h"
+
 class NamesModel;
 
 class Setup_Visual final : public SetupTabScroll
diff --git a/src/gui/widgets/tabs/setuptab.cpp b/src/gui/widgets/tabs/setuptab.cpp
index c445e2ad7..6de77d7a0 100644
--- a/src/gui/widgets/tabs/setuptab.cpp
+++ b/src/gui/widgets/tabs/setuptab.cpp
@@ -26,8 +26,8 @@
 
 SetupTab::SetupTab(const Widget2 *const widget) :
     Container(widget),
-    gcn::ActionListener(),
-    gcn::WidgetListener(),
+    ActionListener(),
+    WidgetListener(),
     mName()
 {
     setOpaque(false);
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index 388b0a988..4d6049b6a 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/widgetlistener.h"
 
 #include <string>
 
@@ -36,8 +36,8 @@
  * A container for the contents of a tab in the setup window.
  */
 class SetupTab : public Container,
-                 public gcn::ActionListener,
-                 public gcn::WidgetListener
+                 public ActionListener,
+                 public WidgetListener
 {
     public:
         A_DELETE_COPY(SetupTab)
diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp
index 659ef5824..9c185b2bb 100644
--- a/src/gui/widgets/tabs/setuptabscroll.cpp
+++ b/src/gui/widgets/tabs/setuptabscroll.cpp
@@ -29,7 +29,7 @@
 SetupTabScroll::SetupTabScroll(const Widget2 *const widget) :
     SetupTab(widget),
     mContainer(new VertContainer(this, 25, false, 8)),
-    mScroll(new ScrollArea(mContainer, false)),
+    mScroll(new ScrollArea(this, mContainer, false)),
     mItems(),
     mAllItems(),
     mPreferredFirstItemSize(200)
@@ -146,7 +146,7 @@ void SetupTabScroll::externalUnloaded()
     }
 }
 
-void SetupTabScroll::widgetResized(const gcn::Event &event A_UNUSED)
+void SetupTabScroll::widgetResized(const Event &event A_UNUSED)
 {
     mScroll->setWidth(getWidth() - 12);
     mScroll->setHeight(getHeight() - 12 - 12);
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index fb7de574d..f7aa628c9 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -56,14 +56,14 @@ class SetupTabScroll : public SetupTab
 
         virtual void externalUnloaded() override;
 
-        virtual void action(const gcn::ActionEvent &event A_UNUSED)
+        virtual void action(const ActionEvent &event A_UNUSED)
                             override final
         { }
 
         int getPreferredFirstItemSize() const A_WARN_UNUSED
         { return mPreferredFirstItemSize; }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void reread(const std::string &name);
 
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 4f1703d31..96ae76787 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -20,14 +20,61 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gui/widgets/tabs/tab.h"
 
 #include "client.h"
 #include "graphicsvertexes.h"
 
+#include "gui/gui.h"
+
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
+#include "resources/image.h"
+
 #include "debug.h"
 
 int Tab::mInstances = 0;
@@ -44,10 +91,9 @@ static std::string const data[Tab::TAB_COUNT] =
 Skin *Tab::tabImg[Tab::TAB_COUNT];
 
 Tab::Tab(const Widget2 *const widget) :
-    gcn::BasicContainer(),
-    Widget2(widget),
-    gcn::MouseListener(),
-    gcn::WidgetListener(),
+    gcn::BasicContainer(widget),
+    MouseListener(),
+    WidgetListener(),
     mLabel(new Label(this)),
     mTabbedArea(nullptr),
     mTabColor(&getThemeColor(Theme::TAB)),
@@ -153,7 +199,7 @@ void Tab::updateAlpha()
     }
 }
 
-void Tab::draw(gcn::Graphics *graphics)
+void Tab::draw(Graphics *graphics)
 {
     BLOCK_START("Tab::draw")
     int mode = TAB_STANDARD;
@@ -204,19 +250,19 @@ void Tab::draw(gcn::Graphics *graphics)
 
     updateAlpha();
 
-    Graphics *const g = static_cast<Graphics*>(graphics);
-
     // draw tab
     if (isBatchDrawRenders(openGLMode))
     {
         const ImageRect &rect = skin->getBorder();
-        if (mRedraw || mode != mMode || g->getRedraw())
+        if (mRedraw || mode != mMode || graphics->getRedraw())
         {
             mMode = mode;
             mRedraw = false;
             mVertexes->clear();
-            g->calcWindow(mVertexes, 0, 0,
-                mDimension.width, mDimension.height, rect);
+            graphics->calcWindow(mVertexes,
+                0, 0,
+                mDimension.width, mDimension.height,
+                rect);
 
             if (mImage)
             {
@@ -224,25 +270,28 @@ void Tab::draw(gcn::Graphics *graphics)
                 if (skin1)
                 {
                     const int padding = skin1->getPadding();
-                    g->calcTileCollection(mVertexes, mImage,
-                        padding, padding);
+                    graphics->calcTileCollection(mVertexes,
+                        mImage,
+                        padding,
+                        padding);
                 }
             }
         }
 
-        g->drawTileCollection(mVertexes);
+        graphics->drawTileCollection(mVertexes);
     }
     else
     {
-        g->drawImageRect(0, 0,
-            mDimension.width, mDimension.height, skin->getBorder());
+        graphics->drawImageRect(0, 0,
+            mDimension.width, mDimension.height,
+            skin->getBorder());
         if (mImage)
         {
             const Skin *const skin1 = tabImg[TAB_STANDARD];
             if (skin1)
             {
                 const int padding = skin1->getPadding();
-                g->drawImage2(mImage, padding, padding);
+                graphics->drawImage(mImage, padding, padding);
             }
         }
     }
@@ -251,17 +300,17 @@ void Tab::draw(gcn::Graphics *graphics)
     BLOCK_END("Tab::draw")
 }
 
-void Tab::widgetResized(const gcn::Event &event A_UNUSED)
+void Tab::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Tab::widgetMoved(const gcn::Event &event A_UNUSED)
+void Tab::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Tab::setLabelFont(gcn::Font *const font)
+void Tab::setLabelFont(Font *const font)
 {
     if (!mLabel)
         return;
@@ -324,12 +373,12 @@ const std::string &Tab::getCaption() const
     return mLabel->getCaption();
 }
 
-void Tab::mouseEntered(gcn::MouseEvent& mouseEvent A_UNUSED)
+void Tab::mouseEntered(MouseEvent& mouseEvent A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void Tab::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
+void Tab::mouseExited(MouseEvent& mouseEvent A_UNUSED)
 {
     mHasMouse = false;
 }
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 118b1f0e2..1f52cde88 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -20,14 +20,56 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef GUI_WIDGETS_TABS_TAB_H
 #define GUI_WIDGETS_TABS_TAB_H
 
-#include "gui/widgets/widget2.h"
+#include "gui/base/basiccontainer.hpp"
 
-#include <guichan/basiccontainer.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
@@ -40,9 +82,8 @@ class TabbedArea;
  * A tab, the same as the Guichan tab in 0.8, but extended
  */
 class Tab : public gcn::BasicContainer,
-            public Widget2,
-            public gcn::MouseListener,
-            public gcn::WidgetListener
+            public MouseListener,
+            public WidgetListener
 {
     public:
         explicit Tab(const Widget2 *const widget);
@@ -68,13 +109,13 @@ class Tab : public gcn::BasicContainer,
         /**
          * Draw the tabbed area.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Set the normal color for the tab's text.
          */
-        void setTabColor(const gcn::Color *const color1,
-                         const gcn::Color *const color2)
+        void setTabColor(const Color *const color1,
+                         const Color *const color2)
         {
             mTabColor = color1;
             mTabOutlineColor = color2;
@@ -83,8 +124,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the highlighted color for the tab's text.
          */
-        void setHighlightedTabColor(const gcn::Color *const color1,
-                                    const gcn::Color *const color2)
+        void setHighlightedTabColor(const Color *const color1,
+                                    const Color *const color2)
         {
             mTabHighlightedColor = color1;
             mTabHighlightedOutlineColor = color2;
@@ -93,8 +134,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the selected color for the tab's text.
          */
-        void setSelectedTabColor(const gcn::Color *const color1,
-                                 const gcn::Color *const color2)
+        void setSelectedTabColor(const Color *const color1,
+                                 const Color *const color2)
         {
             mTabSelectedColor = color1;
             mTabSelectedOutlineColor = color2;
@@ -103,8 +144,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the flash color for the tab's text.
          */
-        void setFlashTabColor(const gcn::Color *const color1,
-                              const gcn::Color *const color2)
+        void setFlashTabColor(const Color *const color1,
+                              const Color *const color2)
         {
             mFlashColor = color1;
             mFlashOutlineColor = color2;
@@ -113,8 +154,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the player flash color for the tab's text.
          */
-        void setPlayerFlashTabColor(const gcn::Color *const color1,
-                                    const gcn::Color *const color2)
+        void setPlayerFlashTabColor(const Color *const color1,
+                                    const Color *const color2)
         {
             mPlayerFlashColor = color1;
             mPlayerFlashOutlineColor = color2;
@@ -129,11 +170,11 @@ class Tab : public gcn::BasicContainer,
         int getFlash() const A_WARN_UNUSED
         { return mFlash; }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
-        void setLabelFont(gcn::Font *const font);
+        void setLabelFont(Font *const font);
 
         Label *getLabel() const A_WARN_UNUSED
         { return mLabel; }
@@ -148,9 +189,9 @@ class Tab : public gcn::BasicContainer,
 
         const std::string &getCaption() const A_WARN_UNUSED;
 
-        void mouseEntered(gcn::MouseEvent &mouseEvent) override final;
+        void mouseEntered(MouseEvent &mouseEvent) override final;
 
-        void mouseExited(gcn::MouseEvent &mouseEvent) override final;
+        void mouseExited(MouseEvent &mouseEvent) override final;
 
         void setImage(Image *const image);
 
@@ -173,16 +214,16 @@ class Tab : public gcn::BasicContainer,
         static int mInstances;           /**< Number of tab instances */
         static float mAlpha;
 
-        const gcn::Color *mTabColor;
-        const gcn::Color *mTabOutlineColor;
-        const gcn::Color *mTabHighlightedColor;
-        const gcn::Color *mTabHighlightedOutlineColor;
-        const gcn::Color *mTabSelectedColor;
-        const gcn::Color *mTabSelectedOutlineColor;
-        const gcn::Color *mFlashColor;
-        const gcn::Color *mFlashOutlineColor;
-        const gcn::Color *mPlayerFlashColor;
-        const gcn::Color *mPlayerFlashOutlineColor;
+        const Color *mTabColor;
+        const Color *mTabOutlineColor;
+        const Color *mTabHighlightedColor;
+        const Color *mTabHighlightedOutlineColor;
+        const Color *mTabSelectedColor;
+        const Color *mTabSelectedOutlineColor;
+        const Color *mFlashColor;
+        const Color *mFlashOutlineColor;
+        const Color *mPlayerFlashColor;
+        const Color *mPlayerFlashOutlineColor;
         int mFlash;
         ImageCollection *mVertexes;
         Image *mImage;
diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp
index ec02bb70f..023d94110 100644
--- a/src/gui/widgets/tabs/whispertab.cpp
+++ b/src/gui/widgets/tabs/whispertab.cpp
@@ -34,7 +34,8 @@
 
 #include "debug.h"
 
-WhisperTab::WhisperTab(const Widget2 *const widget, const std::string &nick) :
+WhisperTab::WhisperTab(const Widget2 *const widget,
+                       const std::string &nick) :
     ChatTab(widget, nick, ""),
     mNick(nick)
 {
diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h
index 5dbb05a4e..84b55ae58 100644
--- a/src/gui/widgets/tabs/whispertab.h
+++ b/src/gui/widgets/tabs/whispertab.h
@@ -57,7 +57,8 @@ class WhisperTab final : public ChatTab
          *
          * @param nick  the name of the player this tab is whispering to
          */
-        WhisperTab(const Widget2 *const widget, const std::string &nick);
+        WhisperTab(const Widget2 *const widget,
+                   const std::string &nick);
 
         ~WhisperTab();
 
diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp
index 24c33c614..57520afce 100644
--- a/src/gui/widgets/tabstrip.cpp
+++ b/src/gui/widgets/tabstrip.cpp
@@ -25,19 +25,21 @@
 #include "debug.h"
 
 TabStrip::TabStrip(const Widget2 *const widget,
-                   const std::string &group, const int height,
+                   const std::string &group,
+                   const int height,
                    const int spacing) :
     WidgetGroup(widget, group, height, spacing)
 {
 }
 
 TabStrip::TabStrip(const Widget2 *const widget,
-                   const int height, const int spacing) :
+                   const int height,
+                   const int spacing) :
     WidgetGroup(widget, "", height, spacing)
 {
 }
 
-gcn::Widget *TabStrip::createWidget(const std::string &text) const
+Widget *TabStrip::createWidget(const std::string &text) const
 {
     Button *const widget = new Button(this);
     widget->setStick(true);
@@ -48,12 +50,12 @@ gcn::Widget *TabStrip::createWidget(const std::string &text) const
     return widget;
 }
 
-void TabStrip::action(const gcn::ActionEvent &event)
+void TabStrip::action(const ActionEvent &event)
 {
     WidgetGroup::action(event);
     if (event.getSource())
     {
-        gcn::Widget *const widget = event.getSource();
+        Widget *const widget = event.getSource();
         if (static_cast<Button*>(widget)->isPressed2())
         {
             FOR_EACH (WidgetListConstIterator, iter, mWidgets)
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index 622ccba81..a89dd5144 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -23,24 +23,24 @@
 
 #include "gui/widgets/widgetgroup.h"
 
-#include <guichan/widget.hpp>
-
 class TabStrip final : public WidgetGroup
 {
     public:
         TabStrip(const Widget2 *const widget,
-                 const std::string &group, const int height,
+                 const std::string &group,
+                 const int height,
                  const int spacing = 0);
 
         TabStrip(const Widget2 *const widget,
-                 const int height, const int spacing = 0);
+                 const int height,
+                 const int spacing = 0);
 
         A_DELETE_COPY(TabStrip)
 
-        gcn::Widget *createWidget(const std::string &name)
-                                  const override final A_WARN_UNUSED;
+        Widget *createWidget(const std::string &name)
+                             const override final A_WARN_UNUSED;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 };
 
 #endif  // GUI_WIDGETS_TABSTRIP_H
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index f59bc0ceb..a1ce0e61d 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -22,18 +22,19 @@
 
 #include "gui/widgets/textbox.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include <sstream>
 
 #include "debug.h"
 
 TextBox::TextBox(const Widget2 *const widget) :
-    gcn::TextBox(),
-    Widget2(widget),
+    gcn::TextBox(widget),
     mMinWidth(getWidth())
 {
     mForegroundColor = getThemeColor(Theme::TEXTBOX);
@@ -87,7 +88,7 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
             text.substr(lastNewlinePos, newlinePos - lastNewlinePos);
         size_t lastSpacePos = 0;
         xpos = 0;
-        const gcn::Font *const font = getFont();
+        const Font *const font = getFont();
         const int spaceWidth = font->getWidth(" ");
         size_t sz = line.size();
 
@@ -165,10 +166,10 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
     gcn::TextBox::setText(wrappedStream.str());
 }
 
-void TextBox::keyPressed(gcn::KeyEvent& keyEvent)
+void TextBox::keyPressed(KeyEvent& keyEvent)
 {
-    const gcn::Key &key = keyEvent.getKey();
-    const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const Key &key = keyEvent.getKey();
+    const int action = keyEvent.getActionId();
 
     switch (action)
     {
@@ -291,7 +292,7 @@ void TextBox::keyPressed(gcn::KeyEvent& keyEvent)
 
         case Input::KEY_GUI_PAGE_UP:
         {
-            gcn::Widget *const par = getParent();
+            Widget *const par = getParent();
 
             if (par)
             {
@@ -307,7 +308,7 @@ void TextBox::keyPressed(gcn::KeyEvent& keyEvent)
 
         case Input::KEY_GUI_PAGE_DOWN:
         {
-            gcn::Widget *const par = getParent();
+            Widget *const par = getParent();
 
             if (par)
             {
@@ -350,16 +351,16 @@ void TextBox::keyPressed(gcn::KeyEvent& keyEvent)
     keyEvent.consume();
 }
 
-void TextBox::draw(gcn::Graphics* graphics)
+void TextBox::draw(Graphics* graphics)
 {
     BLOCK_START("TextBox::draw")
     if (mOpaque)
     {
         graphics->setColor(mBackgroundColor);
-        graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
+        graphics->fillRectangle(Rect(0, 0, getWidth(), getHeight()));
     }
 
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     if (isFocused() && isEditable())
     {
         drawCaret(graphics, font->getWidth(
@@ -367,8 +368,7 @@ void TextBox::draw(gcn::Graphics* graphics)
             mCaretRow * font->getHeight());
     }
 
-    static_cast<Graphics*>(graphics)->setColorAll(
-        mForegroundColor, mForegroundColor2);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     const int fontHeight = font->getHeight();
 
     for (size_t i = 0, sz = mTextRows.size(); i < sz; i++)
@@ -379,14 +379,14 @@ void TextBox::draw(gcn::Graphics* graphics)
     BLOCK_END("TextBox::draw")
 }
 
-void TextBox::setForegroundColor(const gcn::Color &color)
+void TextBox::setForegroundColor(const Color &color)
 {
     mForegroundColor = color;
     mForegroundColor2 = color;
 }
 
-void TextBox::setForegroundColorAll(const gcn::Color &color1,
-                                    const gcn::Color &color2)
+void TextBox::setForegroundColorAll(const Color &color1,
+                                    const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 501744515..3f78fd247 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -23,9 +23,7 @@
 #ifndef GUI_WIDGETS_TEXTBOX_H
 #define GUI_WIDGETS_TEXTBOX_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widgets/textbox.hpp>
+#include "gui/base/widgets/textbox.hpp"
 
 #include "localconsts.h"
 
@@ -36,8 +34,7 @@
  *
  * \ingroup GUI
  */
-class TextBox final : public gcn::TextBox,
-                      public Widget2
+class TextBox final : public gcn::TextBox
 {
     public:
         /**
@@ -60,14 +57,14 @@ class TextBox final : public gcn::TextBox,
         int getMinWidth() const A_WARN_UNUSED
         { return mMinWidth; }
 
-        void keyPressed(gcn::KeyEvent& keyEvent) override final;
+        void keyPressed(KeyEvent& keyEvent) override final;
 
-        void draw(gcn::Graphics* graphics) override final;
+        void draw(Graphics* graphics) override final;
 
-        void setForegroundColor(const gcn::Color &color);
+        void setForegroundColor(const Color &color);
 
-        void setForegroundColorAll(const gcn::Color &color1,
-                                   const gcn::Color &color2);
+        void setForegroundColorAll(const Color &color1,
+                                   const Color &color2);
 
     private:
         int mMinWidth;
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 269ace775..78a2826d5 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -26,10 +26,10 @@
 
 #include "input/inputmanager.h"
 
-#include "input/keyevent.h"
-
-#include "gui/sdlinput.h"
+#include "events/keyevent.h"
 
+#include "gui/font.h"
+#include "gui/gui.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/popupmenu.h"
@@ -39,8 +39,6 @@
 #include "utils/copynpaste.h"
 #include "utils/timer.h"
 
-#include <guichan/font.hpp>
-
 #undef DELETE  // Win32 compatibility hack
 
 #include "debug.h"
@@ -53,12 +51,11 @@ ImageRect TextField::skin;
 TextField::TextField(const Widget2 *restrict const widget,
                      const std::string &restrict text,
                      const bool loseFocusOnTab,
-                     gcn::ActionListener *restrict const listener,
+                     ActionListener *restrict const listener,
                      const std::string &restrict eventId,
                      const bool sendAlwaysEvents):
-    gcn::TextField(text),
-    gcn::FocusListener(),
-    Widget2(widget),
+    gcn::TextField(widget, text),
+    FocusListener(),
     mSendAlwaysEvents(sendAlwaysEvents),
     mCaretColor(&getThemeColor(Theme::CARET)),
     mPopupMenu(nullptr),
@@ -137,30 +134,32 @@ void TextField::updateAlpha()
     }
 }
 
-void TextField::draw(gcn::Graphics *graphics)
+void TextField::draw(Graphics *graphics)
 {
     BLOCK_START("TextField::draw")
     updateAlpha();
 
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     if (isFocused())
     {
         drawCaret(graphics,
             font->getWidth(mText.substr(0, mCaretPosition)) - mXScroll);
     }
 
-    static_cast<Graphics*>(graphics)->setColorAll(
-        mForegroundColor, mForegroundColor2);
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     font->drawString(graphics, mText, mPadding - mXScroll, mPadding);
     BLOCK_END("TextField::draw")
 }
 
-void TextField::drawFrame(gcn::Graphics *graphics)
+void TextField::drawFrame(Graphics *graphics)
 {
     BLOCK_START("TextField::drawFrame")
     const int bs = 2 * mFrameSize;
-    static_cast<Graphics*>(graphics)->drawImageRect(0, 0,
-        mDimension.width + bs, mDimension.height + bs, skin);
+    graphics->drawImageRect(0,
+        0,
+        mDimension.width + bs,
+        mDimension.height + bs,
+        skin);
     BLOCK_END("TextField::drawFrame")
 }
 
@@ -196,13 +195,13 @@ int TextField::getValue() const
     return value;
 }
 
-void TextField::keyPressed(gcn::KeyEvent &keyEvent)
+void TextField::keyPressed(KeyEvent &keyEvent)
 {
     const int val = keyEvent.getKey().getValue();
 #ifdef USE_SDL2
     if (val == Key::TEXTINPUT)
     {
-        std::string str = static_cast<KeyEvent*>(&keyEvent)->getText();
+        std::string str = keyEvent.getText();
         mText.insert(mCaretPosition, str);
         mCaretPosition += str.size();
         keyEvent.consume();
@@ -252,7 +251,7 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent)
             }
 
             if (len > 1)
-                buf[0] |= static_cast<char>(255 << (8 - len));
+                buf[0] |= static_cast<char>(255U << (8 - len));
 
             mText.insert(mCaretPosition, std::string(buf, buf + len));
             mCaretPosition += len;
@@ -291,7 +290,7 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent)
     }
     else
     {
-        const int action = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+        const int action = keyEvent.getActionId();
         if (!inputManager.isActionActive(static_cast<int>(
             Input::KEY_GUI_CTRL)))
         {
@@ -661,12 +660,14 @@ void TextField::handleCopy() const
     sendBuffer(text);
 }
 
-void TextField::drawCaret(gcn::Graphics* graphics, int x)
+void TextField::drawCaret(Graphics* graphics, int x)
 {
-    const gcn::Rectangle &clipArea = graphics->getCurrentClipArea();
+    const Rect *const clipArea = graphics->getCurrentClipArea();
+    if (!clipArea)
+        return;
 
     graphics->setColor(*mCaretColor);
-    graphics->drawLine(x + mPadding, clipArea.height - mPadding,
+    graphics->drawLine(x + mPadding, clipArea->height - mPadding,
         x + mPadding, mPadding);
 }
 
@@ -722,13 +723,13 @@ void TextField::fontChanged()
     fixScroll();
 }
 
-void TextField::mousePressed(gcn::MouseEvent &mouseEvent)
+void TextField::mousePressed(MouseEvent &mouseEvent)
 {
 #ifdef ANDROID
     if (!client->isKeyboardVisible())
         inputManager.executeAction(Input::KEY_SHOW_KEYBOARD);
 #endif
-    if (mouseEvent.getButton() == gcn::MouseEvent::RIGHT)
+    if (mouseEvent.getButton() == MouseEvent::RIGHT)
     {
         if (viewport)
         {
@@ -756,7 +757,7 @@ void TextField::mousePressed(gcn::MouseEvent &mouseEvent)
     }
 }
 
-void TextField::focusGained(const gcn::Event &event A_UNUSED)
+void TextField::focusGained(const Event &event A_UNUSED)
 {
 #ifdef ANDROID
     if (!client->isKeyboardVisible())
@@ -764,6 +765,6 @@ void TextField::focusGained(const gcn::Event &event A_UNUSED)
 #endif
 }
 
-void TextField::focusLost(const gcn::Event &event A_UNUSED)
+void TextField::focusLost(const Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index abff9cf2a..ccc1b16d6 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -23,10 +23,9 @@
 #ifndef GUI_WIDGETS_TEXTFIELD_H
 #define GUI_WIDGETS_TEXTFIELD_H
 
-#include "gui/widgets/widget2.h"
+#include "listeners/focuslistener.h"
 
-#include <guichan/focuslistener.hpp>
-#include <guichan/widgets/textfield.hpp>
+#include "gui/base/widgets/textfield.hpp"
 
 #include "localconsts.h"
 
@@ -38,8 +37,7 @@ class PopupMenu;
  * \ingroup GUI
  */
 class TextField : public gcn::TextField,
-                  public gcn::FocusListener,
-                  public Widget2
+                  public FocusListener
 {
     public:
         /**
@@ -48,7 +46,7 @@ class TextField : public gcn::TextField,
         explicit TextField(const Widget2 *restrict const widget,
                            const std::string &restrict text = "",
                            const bool loseFocusOnTab = true,
-                           gcn::ActionListener *restrict
+                           ActionListener *restrict
                            const listener = nullptr,
                            const std::string &restrict eventId = "",
                            const bool sendAlwaysEvents = false);
@@ -60,7 +58,7 @@ class TextField : public gcn::TextField,
         /**
          * Draws the text field.
          */
-        virtual void draw(gcn::Graphics *graphics) override;
+        virtual void draw(Graphics *graphics) override;
 
         /**
          * Update the alpha value to the graphic components.
@@ -70,7 +68,7 @@ class TextField : public gcn::TextField,
         /**
          * Draws the background and border.
          */
-        void drawFrame(gcn::Graphics *graphics) override final;
+        void drawFrame(Graphics *graphics) override final;
 
         /**
          * Determine whether the field should be numeric or not
@@ -89,7 +87,7 @@ class TextField : public gcn::TextField,
         /**
          * Processes one keypress.
          */
-        void keyPressed(gcn::KeyEvent &keyEvent) override;
+        void keyPressed(KeyEvent &keyEvent) override;
 
         /**
          * Set the minimum value for a range
@@ -117,15 +115,15 @@ class TextField : public gcn::TextField,
 
         void setCaretPosition(unsigned int position);
 
-        void mousePressed(gcn::MouseEvent &mouseEvent) override final;
+        void mousePressed(MouseEvent &mouseEvent) override final;
 
         void handlePaste();
 
         void handleCopy() const;
 
-        void focusGained(const gcn::Event &event) override final;
+        void focusGained(const Event &event) override final;
 
-        void focusLost(const gcn::Event &event) override;
+        void focusLost(const Event &event) override;
 
         void moveCaretBack();
 
@@ -142,7 +140,7 @@ class TextField : public gcn::TextField,
         void caretDeleteWord();
 
     protected:
-        void drawCaret(gcn::Graphics* graphics, int x) override final;
+        void drawCaret(Graphics* graphics, int x) override final;
 
         void fixScroll();
 
@@ -161,7 +159,7 @@ class TextField : public gcn::TextField,
         static Skin *mSkin;
 
     private:
-        const gcn::Color *mCaretColor;
+        const Color *mCaretColor;
         PopupMenu *mPopupMenu;
         static int instances;
         static float mAlpha;
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 8d473dd46..10bd936c6 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -24,8 +24,8 @@
 
 #include "client.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 
 #include "debug.h"
 
@@ -35,8 +35,7 @@ Skin *TextPreview::mSkin = nullptr;
 
 TextPreview::TextPreview(const Widget2 *const widget,
                          const std::string &text) :
-    gcn::Widget(),
-    Widget2(widget),
+    Widget(widget),
     mFont(gui->getFont()),
     mText(text),
     mTextColor(&getThemeColor(Theme::TEXT)),
@@ -79,49 +78,47 @@ TextPreview::~TextPreview()
     }
 }
 
-void TextPreview::draw(gcn::Graphics* graphics)
+void TextPreview::draw(Graphics* graphics)
 {
+    if (!mFont)
+        return;
+
     BLOCK_START("TextPreview::draw")
     if (client->getGuiAlpha() != mAlpha)
         mAlpha = client->getGuiAlpha();
-    Graphics *const g = static_cast<Graphics*>(graphics);
 
     const int intAlpha = static_cast<int>(mAlpha * 255.0F);
     const int alpha = mTextAlpha ? intAlpha : 255;
 
     if (mOpaque)
     {
-        g->setColor(gcn::Color(static_cast<int>(mBGColor->r),
+        graphics->setColor(Color(static_cast<int>(mBGColor->r),
                     static_cast<int>(mBGColor->g),
                     static_cast<int>(mBGColor->b),
                     static_cast<int>(mAlpha * 255.0F)));
-        g->fillRectangle(gcn::Rectangle(0, 0,
+        graphics->fillRectangle(Rect(0, 0,
             mDimension.width, mDimension.height));
     }
 
     if (mTextBGColor)
     {
-        const SDLFont *const font = dynamic_cast<SDLFont*>(mFont);
-        if (font)
-        {
-            const int x = font->getWidth(mText) + 1
-                + 2 * ((mOutline || mShadow) ? 1 :0);
-            const int y = font->getHeight() + 1
-                + 2 * ((mOutline || mShadow) ? 1 : 0);
-            g->setColor(gcn::Color(static_cast<int>(mTextBGColor->r),
-                static_cast<int>(mTextBGColor->g),
-                static_cast<int>(mTextBGColor->b),
-                intAlpha));
-            g->fillRectangle(gcn::Rectangle(mPadding, mPadding, x, y));
-        }
+        const int x = mFont->getWidth(mText) + 1
+            + 2 * ((mOutline || mShadow) ? 1 :0);
+        const int y = mFont->getHeight() + 1
+            + 2 * ((mOutline || mShadow) ? 1 : 0);
+        graphics->setColor(Color(static_cast<int>(mTextBGColor->r),
+            static_cast<int>(mTextBGColor->g),
+            static_cast<int>(mTextBGColor->b),
+            intAlpha));
+        graphics->fillRectangle(Rect(mPadding, mPadding, x, y));
     }
 
-    g->setColorAll(gcn::Color(mTextColor->r, mTextColor->g, mTextColor->b,
-        alpha), gcn::Color(mTextColor2->r, mTextColor2->g, mTextColor2->b,
-        alpha));
+    graphics->setColorAll(Color(mTextColor->r,
+        mTextColor->g, mTextColor->b, alpha),
+        Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha));
 
     if (mOutline && mTextColor != mTextColor2)
-        g->setColor2(Theme::getThemeColor(Theme::OUTLINE));
+        graphics->setColor2(Theme::getThemeColor(Theme::OUTLINE));
 
     mFont->drawString(graphics, mText, mPadding + 1, mPadding + 1);
     BLOCK_END("TextPreview::draw")
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index eeb6805fb..5a09e1148 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -23,29 +23,27 @@
 #ifndef GUI_WIDGETS_TEXTPREVIEW_H
 #define GUI_WIDGETS_TEXTPREVIEW_H
 
-#include "gui/widgets/widget2.h"
-
-#include <guichan/widget.hpp>
+#include "gui/widgets/widget.h"
 
 #include "localconsts.h"
 
 /**
  * Preview widget for particle colors, etc.
  */
-class TextPreview final : public gcn::Widget,
-                          public Widget2
+class TextPreview final : public Widget
 {
     public:
-        TextPreview(const Widget2 *const widget, const std::string &text);
+        TextPreview(const Widget2 *const widget,
+                    const std::string &text);
 
         A_DELETE_COPY(TextPreview)
 
         ~TextPreview();
 
-        inline void setTextColor(const gcn::Color *color)
+        inline void setTextColor(const Color *color)
         { mTextColor = color; adjustSize(); }
 
-        inline void setTextColor2(const gcn::Color *color)
+        inline void setTextColor2(const Color *color)
         { mTextColor2 = color; adjustSize(); }
 
         /**
@@ -62,7 +60,7 @@ class TextPreview final : public gcn::Widget,
          *
          * @param color the color to set
          */
-        inline void setTextBGColor(const gcn::Color *color)
+        inline void setTextBGColor(const Color *color)
         { mTextBGColor = color; }
 
         /**
@@ -70,7 +68,7 @@ class TextPreview final : public gcn::Widget,
          *
          * @param color the color to set
          */
-        inline void setBGColor(const gcn::Color *color)
+        inline void setBGColor(const Color *color)
         { mBGColor = color; }
 
         /**
@@ -78,7 +76,7 @@ class TextPreview final : public gcn::Widget,
          *
          * @param font the font to use.
          */
-        inline void setFont(gcn::Font *const font)
+        inline void setFont(Font *const font)
         { mFont = font; }
 
         /**
@@ -102,7 +100,7 @@ class TextPreview final : public gcn::Widget,
          *
          * @param graphics graphics to draw into
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
         /**
          * Set opacity for this widget (whether or not to show the background
@@ -123,12 +121,12 @@ class TextPreview final : public gcn::Widget,
         void adjustSize();
 
     private:
-        gcn::Font *mFont;
+        Font *mFont;
         std::string mText;
-        const gcn::Color *mTextColor;
-        const gcn::Color *mTextColor2;
-        const gcn::Color *mBGColor;
-        const gcn::Color *mTextBGColor;
+        const Color *mTextColor;
+        const Color *mTextColor2;
+        const Color *mBGColor;
+        const Color *mTextBGColor;
         int mPadding;
         static int instances;
         static float mAlpha;
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index a91f20657..b86aa3e5f 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -24,10 +24,11 @@
 #include "debug.h"
 
 VertContainer::VertContainer(const Widget2 *const widget,
-                             const int verticalItemSize, const bool resizable,
+                             const int verticalItemSize,
+                             const bool resizable,
                              const int leftSpacing) :
     Container(widget),
-    gcn::WidgetListener(),
+    WidgetListener(),
     mResizableWidgets(),
     mVerticalItemSize(verticalItemSize),
     mCount(0),
@@ -39,12 +40,12 @@ VertContainer::VertContainer(const Widget2 *const widget,
     addWidgetListener(this);
 }
 
-void VertContainer::add1(gcn::Widget *const widget, const int spacing)
+void VertContainer::add1(Widget *const widget, const int spacing)
 {
     add2(widget, mResizable, spacing);
 }
 
-void VertContainer::add2(gcn::Widget *const widget, const bool resizable,
+void VertContainer::add2(Widget *const widget, const bool resizable,
                          const int spacing)
 {
     if (!widget)
@@ -79,8 +80,8 @@ void VertContainer::clear()
     mResizableWidgets.clear();
 }
 
-void VertContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void VertContainer::widgetResized(const Event &event A_UNUSED)
 {
-    FOR_EACH (std::vector<gcn::Widget*>::const_iterator, it, mResizableWidgets)
+    FOR_EACH (std::vector<Widget*>::const_iterator, it, mResizableWidgets)
         (*it)->setWidth(getWidth());
 }
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 76f6354dd..05ba2e32f 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "listeners/widgetlistener.h"
 
 #include <vector>
 
@@ -35,26 +35,28 @@
  *
  * This container places it's contents veritcally.
  */
-class VertContainer final : public Container, public gcn::WidgetListener
+class VertContainer final : public Container,
+                            public WidgetListener
 {
     public:
         VertContainer(const Widget2 *const widget,
-                      const int verticalItemSize, const bool resizable = true,
+                      const int verticalItemSize,
+                      const bool resizable = true,
                       const int leftSpacing = 0);
 
         A_DELETE_COPY(VertContainer)
 
-        void add2(gcn::Widget *const widget, const bool resizable,
+        void add2(Widget *const widget, const bool resizable,
                   const int spacing = -1);
 
-        void add1(gcn::Widget *const widget, const int spacing = -1);
+        void add1(Widget *const widget, const int spacing = -1);
 
         void clear();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     private:
-        std::vector<gcn::Widget*> mResizableWidgets;
+        std::vector<Widget*> mResizableWidgets;
         int mVerticalItemSize;
         int mCount;
         int mNextY;
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
new file mode 100644
index 000000000..5b2024b1f
--- /dev/null
+++ b/src/gui/widgets/widget.cpp
@@ -0,0 +1,666 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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/>.
+ */
+
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "gui/widgets/widget.h"
+
+#include "events/actionevent.h"
+
+#include "events/event.h"
+
+#include "gui/focushandler.h"
+
+#include "listeners/actionlistener.h"
+#include "listeners/deathlistener.h"
+#include "listeners/widgetlistener.h"
+
+#include "render/graphics.h"
+
+#include "debug.h"
+
+Font* Widget::mGlobalFont = nullptr;
+std::list<Widget*> Widget::mWidgets;
+std::set<Widget*> Widget::mWidgetsSet;
+
+Widget::Widget(const Widget2 *const widget) :
+    Widget2(widget),
+    mMouseListeners(),
+    mKeyListeners(),
+    mActionListeners(),
+    mDeathListeners(),
+    mFocusListeners(),
+    mWidgetListeners(),
+    mForegroundColor(0x000000),
+    mBackgroundColor(0xffffff),
+    mBaseColor(0x808090),
+    mSelectionColor(0xc3d9ff),
+    mFocusHandler(nullptr),
+    mInternalFocusHandler(nullptr),
+    mParent(nullptr),
+    mDimension(),
+    mFrameSize(0),
+    mActionEventId(),
+    mFocusable(false),
+    mVisible(true),
+    mTabIn(true),
+    mTabOut(true),
+    mEnabled(true),
+    mId(),
+    mCurrentFont(nullptr)
+{
+    mWidgets.push_back(this);
+    mWidgetsSet.insert(this);
+}
+
+Widget::~Widget()
+{
+    for (DeathListenerIterator iter = mDeathListeners.begin();
+          iter != mDeathListeners.end();
+          ++iter)
+    {
+        Event event(this);
+        (*iter)->death(event);
+    }
+
+    _setFocusHandler(nullptr);
+
+    mWidgets.remove(this);
+    mWidgetsSet.erase(this);
+}
+
+void Widget::drawFrame(Graphics* graphics)
+{
+    BLOCK_START("Widget::drawFrame")
+    const Color &faceColor = getBaseColor();
+    Color highlightColor = faceColor + Color(0x303030);
+    Color shadowColor = faceColor - Color(0x303030);
+    const int alpha = getBaseColor().a;
+    const int width = getWidth() + getFrameSize() * 2 - 1;
+    const int height = getHeight() + getFrameSize() * 2 - 1;
+    highlightColor.a = alpha;
+    shadowColor.a = alpha;
+
+    for (unsigned int i = 0; i < getFrameSize(); ++i)
+    {
+        graphics->setColor(shadowColor);
+        graphics->drawLine(i, i, width - i, i);
+        graphics->drawLine(i, i + 1, i, height - i - 1);
+        graphics->setColor(highlightColor);
+        graphics->drawLine(width - i, i + 1, width - i, height - i);
+        graphics->drawLine(i, height - i, width - i - 1, height - i);
+    }
+    BLOCK_END("Widget::drawFrame")
+}
+
+void Widget::_setParent(Widget* parent)
+{
+    mParent = parent;
+}
+
+void Widget::setWidth(int width)
+{
+    Rect newDimension = mDimension;
+    newDimension.width = width;
+
+    setDimension(newDimension);
+}
+
+void Widget::setHeight(int height)
+{
+    Rect newDimension = mDimension;
+    newDimension.height = height;
+
+    setDimension(newDimension);
+}
+
+void Widget::setX(int x)
+{
+    Rect newDimension = mDimension;
+    newDimension.x = x;
+
+    setDimension(newDimension);
+}
+
+void Widget::setY(int y)
+{
+    Rect newDimension = mDimension;
+    newDimension.y = y;
+
+    setDimension(newDimension);
+}
+
+void Widget::setPosition(int x, int y)
+{
+    Rect newDimension = mDimension;
+    newDimension.x = x;
+    newDimension.y = y;
+
+    setDimension(newDimension);
+}
+
+void Widget::setDimension(const Rect& dimension)
+{
+    const Rect oldDimension = mDimension;
+    mDimension = dimension;
+
+    if (mDimension.width != oldDimension.width
+        || mDimension.height != oldDimension.height)
+    {
+        distributeResizedEvent();
+    }
+
+    if (mDimension.x != oldDimension.x
+        || mDimension.y != oldDimension.y)
+    {
+        distributeMovedEvent();
+    }
+}
+
+void Widget::setFrameSize(unsigned int frameSize)
+{
+    mFrameSize = frameSize;
+}
+
+unsigned int Widget::getFrameSize() const
+{
+    return mFrameSize;
+}
+
+const Rect& Widget::getDimension() const
+{
+    return mDimension;
+}
+
+const std::string& Widget::getActionEventId() const
+{
+    return mActionEventId;
+}
+
+void Widget::setActionEventId(const std::string& actionEventId)
+{
+    mActionEventId = actionEventId;
+}
+
+bool Widget::isFocused() const
+{
+    if (!mFocusHandler)
+        return false;
+
+    return (mFocusHandler->isFocused(this));
+}
+
+void Widget::setFocusable(bool focusable)
+{
+    if (!focusable && isFocused())
+    {
+        mFocusHandler->focusNone();
+    }
+
+    mFocusable = focusable;
+}
+
+bool Widget::isFocusable() const
+{
+    return mFocusable && isVisible() && isEnabled();
+}
+
+void Widget::requestFocus()
+{
+    if (!mFocusHandler)
+        return;
+
+    if (isFocusable())
+        mFocusHandler->requestFocus(this);
+}
+
+void Widget::requestMoveToTop()
+{
+    if (mParent)
+        mParent->moveToTop(this);
+}
+
+void Widget::requestMoveToBottom()
+{
+    if (mParent)
+        mParent->moveToBottom(this);
+}
+
+void Widget::setVisible(bool visible)
+{
+    if (!visible && isFocused())
+        mFocusHandler->focusNone();
+
+    if (visible)
+        distributeShownEvent();
+    else
+        distributeHiddenEvent();
+
+    mVisible = visible;
+}
+
+void Widget::setBaseColor(const Color& color)
+{
+    mBaseColor = color;
+}
+
+const Color& Widget::getBaseColor() const
+{
+    return mBaseColor;
+}
+
+void Widget::setForegroundColor(const Color& color)
+{
+    mForegroundColor = color;
+}
+
+const Color& Widget::getForegroundColor() const
+{
+    return mForegroundColor;
+}
+
+void Widget::setBackgroundColor(const Color& color)
+{
+    mBackgroundColor = color;
+}
+
+const Color& Widget::getBackgroundColor() const
+{
+    return mBackgroundColor;
+}
+
+void Widget::setSelectionColor(const Color& color)
+{
+    mSelectionColor = color;
+}
+
+const Color& Widget::getSelectionColor() const
+{
+    return mSelectionColor;
+}
+
+void Widget::_setFocusHandler(FocusHandler* focusHandler)
+{
+    if (mFocusHandler)
+    {
+        releaseModalFocus();
+        mFocusHandler->remove(this);
+    }
+
+    if (focusHandler)
+        focusHandler->add(this);
+
+    mFocusHandler = focusHandler;
+}
+
+FocusHandler* Widget::_getFocusHandler()
+{
+    return mFocusHandler;
+}
+
+void Widget::addActionListener(ActionListener* actionListener)
+{
+    mActionListeners.push_back(actionListener);
+}
+
+void Widget::removeActionListener(ActionListener* actionListener)
+{
+    mActionListeners.remove(actionListener);
+}
+
+void Widget::addDeathListener(DeathListener* deathListener)
+{
+    mDeathListeners.push_back(deathListener);
+}
+
+void Widget::removeDeathListener(DeathListener* deathListener)
+{
+    mDeathListeners.remove(deathListener);
+}
+
+void Widget::addKeyListener(KeyListener* keyListener)
+{
+    mKeyListeners.push_back(keyListener);
+}
+
+void Widget::removeKeyListener(KeyListener* keyListener)
+{
+    mKeyListeners.remove(keyListener);
+}
+
+void Widget::addFocusListener(FocusListener* focusListener)
+{
+    mFocusListeners.push_back(focusListener);
+}
+
+void Widget::removeFocusListener(FocusListener* focusListener)
+{
+    mFocusListeners.remove(focusListener);
+}
+
+void Widget::addMouseListener(MouseListener* mouseListener)
+{
+    mMouseListeners.push_back(mouseListener);
+}
+
+void Widget::removeMouseListener(MouseListener* mouseListener)
+{
+    mMouseListeners.remove(mouseListener);
+}
+
+void Widget::addWidgetListener(WidgetListener* widgetListener)
+{
+    mWidgetListeners.push_back(widgetListener);
+}
+
+void Widget::removeWidgetListener(WidgetListener* widgetListener)
+{
+    mWidgetListeners.remove(widgetListener);
+}
+
+void Widget::getAbsolutePosition(int& x, int& y) const
+{
+    if (!mParent)
+    {
+        x = mDimension.x;
+        y = mDimension.y;
+        return;
+    }
+
+    int parentX;
+    int parentY;
+
+    mParent->getAbsolutePosition(parentX, parentY);
+
+    const Rect &rect = mParent->getChildrenArea();
+    x = parentX + mDimension.x + rect.x;
+    y = parentY + mDimension.y + rect.y;
+}
+
+Font* Widget::getFont() const
+{
+    if (!mCurrentFont)
+        return mGlobalFont;
+    return mCurrentFont;
+}
+
+void Widget::setGlobalFont(Font* font)
+{
+    mGlobalFont = font;
+
+    for (std::list<Widget*>::const_iterator iter = mWidgets.begin();
+          iter != mWidgets.end(); ++iter)
+    {
+        if (!(*iter)->mCurrentFont)
+            (*iter)->fontChanged();
+    }
+}
+
+void Widget::setFont(Font* font)
+{
+    mCurrentFont = font;
+    fontChanged();
+}
+
+bool Widget::widgetExists(const Widget* widget)
+{
+    return mWidgetsSet.find(const_cast<Widget*>(widget))
+        != mWidgetsSet.end();
+}
+
+bool Widget::isTabInEnabled() const
+{
+    return mTabIn;
+}
+
+void Widget::setTabInEnabled(bool enabled)
+{
+    mTabIn = enabled;
+}
+
+bool Widget::isTabOutEnabled() const
+{
+    return mTabOut;
+}
+
+void Widget::setTabOutEnabled(bool enabled)
+{
+    mTabOut = enabled;
+}
+
+void Widget::setSize(int width, int height)
+{
+    Rect newDimension = mDimension;
+    newDimension.width = width;
+    newDimension.height = height;
+
+    setDimension(newDimension);
+}
+
+void Widget::setEnabled(bool enabled)
+{
+    mEnabled = enabled;
+}
+
+bool Widget::isEnabled() const
+{
+    return mEnabled && isVisible();
+}
+
+void Widget::requestModalFocus()
+{
+    if (!mFocusHandler)
+        return;
+
+    mFocusHandler->requestModalFocus(this);
+}
+
+void Widget::requestModalMouseInputFocus()
+{
+    if (!mFocusHandler)
+        return;
+
+    mFocusHandler->requestModalMouseInputFocus(this);
+}
+
+void Widget::releaseModalFocus()
+{
+    if (!mFocusHandler)
+        return;
+
+    mFocusHandler->releaseModalFocus(this);
+}
+
+void Widget::releaseModalMouseInputFocus()
+{
+    if (!mFocusHandler)
+        return;
+
+    mFocusHandler->releaseModalMouseInputFocus(this);
+}
+
+bool Widget::isModalFocused() const
+{
+    if (!mFocusHandler)
+        return false;
+
+    if (mParent)
+    {
+        return (mFocusHandler->getModalFocused() == this)
+            || mParent->isModalFocused();
+    }
+
+    return mFocusHandler->getModalFocused() == this;
+}
+
+bool Widget::isModalMouseInputFocused() const
+{
+    if (!mFocusHandler)
+        return false;
+
+    if (mParent)
+    {
+        return (mFocusHandler->getModalMouseInputFocused() == this)
+            || mParent->isModalMouseInputFocused();
+    }
+
+    return mFocusHandler->getModalMouseInputFocused() == this;
+}
+
+Widget *Widget::getWidgetAt(int x A_UNUSED, int y A_UNUSED)
+{
+    return nullptr;
+}
+
+const std::list<MouseListener*>& Widget::_getMouseListeners()
+{
+    return mMouseListeners;
+}
+
+const std::list<KeyListener*>& Widget::_getKeyListeners()
+{
+    return mKeyListeners;
+}
+
+const std::list<FocusListener*>& Widget::_getFocusListeners()
+{
+    return mFocusListeners;
+}
+
+Rect Widget::getChildrenArea()
+{
+    return Rect(0, 0, 0, 0);
+}
+
+FocusHandler* Widget::_getInternalFocusHandler()
+{
+    return mInternalFocusHandler;
+}
+
+void Widget::setInternalFocusHandler(FocusHandler* focusHandler)
+{
+    mInternalFocusHandler = focusHandler;
+}
+
+void Widget::distributeResizedEvent()
+{
+    for (WidgetListenerIterator iter = mWidgetListeners.begin();
+          iter != mWidgetListeners.end();
+          ++ iter)
+    {
+        Event event(this);
+        (*iter)->widgetResized(event);
+    }
+}
+
+void Widget::distributeMovedEvent()
+{
+    for (WidgetListenerIterator iter = mWidgetListeners.begin();
+          iter != mWidgetListeners.end();
+          ++ iter)
+    {
+        Event event(this);
+        (*iter)->widgetMoved(event);
+    }
+}
+
+void Widget::distributeHiddenEvent()
+{
+    for (WidgetListenerIterator iter = mWidgetListeners.begin();
+          iter != mWidgetListeners.end();
+          ++ iter)
+    {
+        Event event(this);
+        (*iter)->widgetHidden(event);
+    }
+}
+
+void Widget::distributeActionEvent()
+{
+    for (ActionListenerIterator iter = mActionListeners.begin();
+          iter != mActionListeners.end();
+          ++iter)
+    {
+        ActionEvent actionEvent(this, mActionEventId);
+        (*iter)->action(actionEvent);
+    }
+}
+
+void Widget::distributeShownEvent()
+{
+    for (WidgetListenerIterator iter = mWidgetListeners.begin();
+          iter != mWidgetListeners.end();
+          ++iter)
+    {
+        Event event(this);
+        (*iter)->widgetShown(event);
+    }
+}
+
+void Widget::showPart(Rect rectangle)
+{
+    if (mParent)
+        mParent->showWidgetPart(this, rectangle);
+}
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
new file mode 100644
index 000000000..17f016c76
--- /dev/null
+++ b/src/gui/widgets/widget.h
@@ -0,0 +1,1230 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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/>.
+ */
+
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GUI_WIDGETS_WIDGET_H
+#define GUI_WIDGETS_WIDGET_H
+
+#include <list>
+#include <set>
+#include <string>
+
+#include "gui/color.h"
+#include "gui/rect.h"
+
+#include "gui/widgets/widget2.h"
+
+#include "localconsts.h"
+
+class ActionListener;
+class DeathListener;
+class FocusHandler;
+class FocusListener;
+class Font;
+class Graphics;
+class KeyListener;
+class MouseListener;
+class WidgetListener;
+
+/**
+  * Abstract class for widgets of Guichan. It contains basic functions 
+  * every widget should have.
+  *
+  * NOTE: Functions begining with underscore "_" should not
+  *       be overloaded unless you know what you are doing
+  *
+  * @author Olof Naessén
+  * @author Per Larsson.
+  * @since 0.1.0
+  */
+class Widget : public Widget2
+{
+    public:
+        /**
+          * Constructor. Resets member variables. Noteable, a widget is not
+          * focusable as default, therefore, widgets that are supposed to be
+          * focusable should overide this default in their own constructor.
+          */
+        explicit Widget(const Widget2 *const widget);
+
+        A_DELETE_COPY(Widget)
+
+        /**
+          * Default destructor.
+          */
+        virtual ~Widget();
+
+        /**
+          * Draws the widget. It is called by the parent widget when it is time
+          * for the widget to draw itself. The graphics object is set up so
+          * that all drawing is relative to the widget, i.e coordinate (0,0) is
+          * the top left corner of the widget. It is not possible to draw
+          * outside of a widget's dimension.
+          *
+          * @param graphics aA graphics object to draw with.
+          * @since 0.1.0
+          */
+        virtual void draw(Graphics* graphics) = 0;
+
+        /**
+          * Called when a widget is given a chance to draw a frame around itself.
+          * The frame is not considered a part of the widget, it only allows a frame
+          * to be drawn around the widget, thus a frame will never be included when
+          * calculating if a widget should receive events from user input. Also
+          * a widget's frame will never be included when calculating a widget's 
+          * position.
+          * 
+          * The size of the frame is calculated using the widget's frame size. 
+          * If a widget has a frame size of 10 pixels than the area the drawFrame 
+          * function can draw to will be the size of the widget with an additional 
+          * extension of 10 pixels in each direction.
+          *
+          * An example when drawFrame is a useful function is if a widget needs
+          * a glow around itself.
+          *
+          * @param graphics A graphics object to draw with.
+          * @see setFrameSize, getFrameSize
+          * @since 0.8.0
+          */
+        virtual void drawFrame(Graphics* graphics);
+
+        /**
+          * Sets the size of the widget's frame. The frame is not considered a part of 
+          * the widget, it only allows a frame to be drawn around the widget, thus a frame 
+          * will never be included when calculating if a widget should receive events 
+          * from user input. Also a widget's frame will never be included when calculating
+          * a widget's position.
+          *
+          * A frame size of 0 means that the widget has no frame. The default frame size
+          * is 0.
+          *
+          * @param frameSize The size of the widget's frame.
+          * @see getFrameSize, drawFrame
+          * @since 0.8.0
+          */
+        void setFrameSize(unsigned int frameSize);
+
+        /**
+          * Gets the size of the widget's frame. The frame is not considered a part of 
+          * the widget, it only allows a frame to be drawn around the widget, thus a frame 
+          * will never be included when calculating if a widget should receive events 
+          * from user input. Also a widget's frame will never be included when calculating
+          * a widget's position.
+          *
+          * A frame size of 0 means that the widget has no frame. The default frame size
+          * is 0.
+          *
+          * @return The size of the widget's frame.
+          * @see setFrameSize, drawFrame
+          * @since 0.8.0
+          */
+        unsigned int getFrameSize() const A_WARN_UNUSED;
+
+        /**
+          * Called for all widgets in the gui each time Gui::logic is called.
+          * You can do logic stuff here like playing an animation.
+          *
+          * @see Gui::logic
+          * @since 0.1.0
+          */
+        virtual void logic()
+        { }
+
+        /**
+          * Gets the widget's parent container.
+          *
+          * @return The widget's parent container. NULL if the widget
+          *         has no parent.
+          * @since 0.1.0
+          */
+        virtual Widget* getParent() const A_WARN_UNUSED
+        { return mParent; }
+
+        /**
+          * Sets the width of the widget.
+          *
+          * @param width The width of the widget.
+          * @see getWidth, setHeight, getHeight, setSize,
+          *      setDimension, getDimensi
+          * @since 0.1.0
+          */
+        void setWidth(int width);
+
+        /**
+          * Gets the width of the widget.
+          *
+          * @return The width of the widget.
+          * @see setWidth, setHeight, getHeight, setSize,
+          *      setDimension, getDimension
+          * @since 0.1.0
+          */
+        int getWidth() const A_WARN_UNUSED
+        { return mDimension.width; }
+
+        /**
+          * Sets the height of the widget.
+          *
+          * @param height The height of the widget.
+          * @see getHeight, setWidth, getWidth, setSize,
+          *      setDimension, getDimension
+          * @since 0.1.0
+          */
+        void setHeight(int height);
+
+        /**
+          * Gets the height of the widget.
+          *
+          * @return The height of the widget.
+          * @see setHeight, setWidth, getWidth, setSize,
+          *      setDimension, getDimension
+          * @since 0.1.0
+          */
+        int getHeight() const A_WARN_UNUSED
+        { return mDimension.height; }
+
+        /**
+          * Sets the size of the widget.
+          *
+          * @param width The width of the widget.
+          * @param height The height of the widget.
+          * @see setWidth, setHeight, getWidth, getHeight,
+          *      setDimension, getDimension
+          * @since 0.1.0
+          */
+        void setSize(int width, int height);
+
+        /**
+          * Sets the x coordinate of the widget. The coordinate is
+          * relateive to the widget's parent.
+          *
+          * @param x The x coordinate of the widget.
+          * @see getX, setY, getY, setPosition, setDimension, getDimension
+          * @since 0.1.0
+          */
+        void setX(int x);
+
+        /**
+          * Gets the x coordinate of the widget. The coordinate is
+          * relative to the widget's parent.
+          *
+          * @return The x coordinate of the widget.
+          * @see setX, setY, getY, setPosition, setDimension, getDimension
+          * @since 0.1.0
+          */
+        int getX() const A_WARN_UNUSED
+        { return mDimension.x; }
+
+        /**
+          * Sets the y coordinate of the widget. The coordinate is
+          * relative to the widget's parent.
+          *
+          * @param y The y coordinate of the widget.
+          * @see setY, setX, getX, setPosition, setDimension, getDimension
+          * @since 0.1.0
+          */
+        void setY(int y);
+
+        /**
+          * Gets the y coordinate of the widget. The coordinate is
+          * relative to the widget's parent.
+          *
+          * @return The y coordinate of the widget.
+          * @see setY, setX, getX, setPosition, setDimension, getDimension
+          * @since 0.1.0
+          */
+        int getY() const A_WARN_UNUSED
+        { return mDimension.y; }
+
+        /**
+          * Sets position of the widget. The position is relative
+          * to the widget's parent.
+          *
+          * @param x The x coordinate of the widget.
+          * @param y The y coordinate of the widget.
+          * @see setX, getX, setY, getY, setDimension, getDimension
+          * @since 0.1.0
+          */
+        void setPosition(int x, int y);
+
+        /**
+          * Sets the dimension of the widget. The dimension is
+          * relative to the widget's parent.
+          *
+          * @param dimension The dimension of the widget.
+          * @see getDimension, setX, getX, setY, getY, setPosition
+          * @since 0.1.0
+          */
+        void setDimension(const Rect& dimension);
+
+        /**
+          * Gets the dimension of the widget. The dimension is
+          * relative to the widget's parent.
+          *
+          * @return The dimension of the widget.
+          * @see getDimension, setX, getX, setY, getY, setPosition
+          * @since 0.1.0
+          */
+        const Rect& getDimension() const A_WARN_UNUSED;
+
+        /**
+          * Sets the widget to be fosusable, or not.
+          *
+          * @param focusable True if the widget should be focusable,
+          *                  false otherwise.
+          * @see isFocusable
+          * @since 0.1.0
+          */
+        void setFocusable(bool focusable);
+
+          /**
+          * Checks if a widget is focsable.
+          *
+          * @return True if the widget should be focusable, false otherwise.
+          * @see setFocusable
+          * @since 0.1.0
+          */
+        bool isFocusable() const A_WARN_UNUSED;
+
+        /**
+          * Checks if the widget is focused.
+          *
+          * @return True if the widget is focused, false otherwise.
+          * @since 0.1.0
+          */
+        virtual bool isFocused() const A_WARN_UNUSED;
+
+        /**
+          * Sets the widget to enabled, or not. A disabled
+          * widget will never recieve mouse or key events.
+          *
+          * @param enabled True if widget should be enabled,
+          *                false otherwise.
+          * @see isEnabled
+          * @since 0.1.0
+          */
+        void setEnabled(bool enabled);
+
+        /**
+          * Checks if the widget is enabled. A disabled
+          * widget will never recieve mouse or key events.
+          *
+          * @return True if widget is enabled, false otherwise.
+          * @see setEnabled
+          * @since 0.1.0
+          */
+        bool isEnabled() const A_WARN_UNUSED;
+
+        /**
+          * Sets the widget to be visible, or not.
+          *
+          * @param visible True if widget should be visible, false otherwise.
+          * @see isVisible
+          * @since 0.1.0
+          */
+        void setVisible(bool visible);
+
+        /**
+          * Checks if the widget is visible.
+          *
+          * @return True if widget is be visible, false otherwise.
+          * @see setVisible
+          * @since 0.1.0
+          */
+        bool isVisible() const A_WARN_UNUSED
+        { return mVisible && (!mParent || mParent->isVisible()); }
+
+        /**
+          * Sets the base color of the widget.
+          *
+          * @param color The baseground color.
+          * @see getBaseColor
+          * @since 0.1.0
+          */
+        void setBaseColor(const Color& color);
+
+        /**
+          * Gets the base color.
+          *
+          * @return The base color.
+          * @see setBaseColor
+          * @since 0.1.0
+          */
+        const Color& getBaseColor() const A_WARN_UNUSED;
+
+        /**
+          * Sets the foreground color.
+          *
+          * @param color The foreground color.
+          * @see getForegroundColor
+          * @since 0.1.0
+          */
+        void setForegroundColor(const Color& color);
+
+        /**
+          * Gets the foreground color.
+          *
+          * @see setForegroundColor
+          * @since 0.1.0
+          */
+        const Color& getForegroundColor() const A_WARN_UNUSED;
+
+        /**
+          * Sets the background color.
+          *
+          * @param color The background Color.
+          * @see setBackgroundColor
+          * @since 0.1.0
+          */
+        void setBackgroundColor(const Color& color);
+
+        /**
+          * Gets the background color.
+          *
+          * @see setBackgroundColor
+          * @since 0.1.0
+          */
+        const Color& getBackgroundColor() const A_WARN_UNUSED;
+
+        /**
+          * Sets the selection color.
+          *
+          * @param color The selection color.
+          * @see getSelectionColor
+          * @since 0.6.0
+          */
+        void setSelectionColor(const Color& color);
+
+        /**
+          * Gets the selection color.
+          *
+          * @return The selection color.
+          * @see setSelectionColor
+          * @since 0.6.0
+          */
+        const Color& getSelectionColor() const A_WARN_UNUSED;
+
+        /**
+          * Requests focus for the widget. A widget will only recieve focus
+          * if it is focusable.
+          */
+        virtual void requestFocus();
+
+        /**
+          * Requests a move to the top in the parent widget.
+          */
+        virtual void requestMoveToTop();
+
+        /**
+          * Requests a move to the bottom in the parent widget.
+          */
+        virtual void requestMoveToBottom();
+
+        /**
+          * Sets the focus handler to be used.
+          *
+          * WARNING: This function is used internally and should not
+          *          be called or overloaded unless you know what you
+          *          are doing.
+          *
+          * @param focusHandler The focus handler to use.
+          * @see _getFocusHandler
+          * @since 0.1.0
+          */
+        virtual void _setFocusHandler(FocusHandler* focusHandler);
+
+        /**
+          * Gets the focus handler used.
+          *
+          * WARNING: This function is used internally and should not
+          *          be called or overloaded unless you know what you
+          *          are doing.
+          *
+          * @return The focus handler used.
+          * @see _setFocusHandler
+          * @since 0.1.0
+          */
+        virtual FocusHandler* _getFocusHandler() A_WARN_UNUSED;
+
+        /**
+          * Adds an action listener to the widget. When an action event 
+          * is fired by the widget the action listeners of the widget 
+          * will get notified.
+          *
+          * @param actionListener The action listener to add.
+          * @see removeActionListener
+          * @since 0.1.0
+          */
+        void addActionListener(ActionListener* actionListener);
+
+        /**
+          * Removes an added action listener from the widget.
+          *
+          * @param actionListener The action listener to remove.
+          * @see addActionListener
+          * @since 0.1.0
+          */
+        void removeActionListener(ActionListener* actionListener);
+
+        /**
+          * Adds a death listener to the widget. When a death event is 
+          * fired by the widget the death listeners of the widget will 
+          * get notified.
+          *
+          * @param deathListener The death listener to add.
+          * @see removeDeathListener
+          * @since 0.1.0
+          */
+        void addDeathListener(DeathListener* deathListener);
+
+        /**
+          * Removes an added death listener from the widget.
+          *
+          * @param deathListener The death listener to remove.
+          * @see addDeathListener
+          * @since 0.1.0
+          */
+        void removeDeathListener(DeathListener* deathListener);
+
+        /**
+          * Adds a mouse listener to the widget. When a mouse event is 
+          * fired by the widget the mouse listeners of the widget will 
+          * get notified.
+          *
+          * @param mouseListener The mouse listener to add.
+          * @see removeMouseListener
+          * @since 0.1.0
+          */
+        void addMouseListener(MouseListener* mouseListener);
+
+        /**
+          * Removes an added mouse listener from the widget.
+          *
+          * @param mouseListener The mouse listener to remove.
+          * @see addMouseListener
+          * @since 0.1.0
+          */
+        void removeMouseListener(MouseListener* mouseListener);
+
+        /**
+          * Adds a key listener to the widget. When a key event is 
+          * fired by the widget the key listeners of the widget will 
+          * get notified.
+          *
+          * @param keyListener The key listener to add.
+          * @see removeKeyListener
+          * @since 0.1.0
+          */
+        void addKeyListener(KeyListener* keyListener);
+
+        /**
+          * Removes an added key listener from the widget.
+          *
+          * @param keyListener The key listener to remove.
+          * @see addKeyListener
+          * @since 0.1.0
+          */
+        void removeKeyListener(KeyListener* keyListener);
+
+        /**
+          * Adds a focus listener to the widget. When a focus event is 
+          * fired by the widget the key listeners of the widget will 
+          * get notified.
+          *
+          * @param focusListener The focus listener to add.
+          * @see removeFocusListener
+          * @since 0.7.0
+          */
+        void addFocusListener(FocusListener* focusListener);
+
+        /**
+          * Removes an added focus listener from the widget.
+          *
+          * @param focusListener The focus listener to remove.
+          * @see addFocusListener
+          * @since 0.7.0
+          */
+        void removeFocusListener(FocusListener* focusListener);
+
+        /**
+          * Adds a widget listener to the widget. When a widget event is 
+          * fired by the widget the key listeners of the widget will 
+          * get notified.
+          *
+          * @param widgetListener The widget listener to add.
+          * @see removeWidgetListener
+          * @since 0.8.0
+          */
+        void addWidgetListener(WidgetListener* widgetListener);
+
+        /**
+          * Removes an added widget listener from the widget.
+          *
+          * @param widgetListener The widget listener to remove.
+          * @see addWidgetListener
+          * @since 0.8.0
+          */
+        void removeWidgetListener(WidgetListener* widgetListener);
+
+        /**
+          * Sets the action event identifier of the widget. The identifier is
+          * used to be able to identify which action has occured.
+          *
+          * NOTE: An action event identifier should not be used to identify a
+          *       certain widget but rather a certain event in your application.
+          *       Several widgets can have the same action event identifer.
+          *
+          * @param actionEventId The action event identifier.
+          * @see getActionEventId
+          * @since 0.6.0
+          */
+        void setActionEventId(const std::string& actionEventId);
+
+        /**
+          * Gets the action event identifier of the widget.
+          *
+          * @return The action event identifier of the widget.
+          * @see setActionEventId
+          * @since 0.6.0
+          */
+        const std::string& getActionEventId() const;
+
+        /**
+          * Gets the absolute position on the screen for the widget.
+          *
+          * @param x The absolute x coordinate will be stored in this parameter.
+          * @param y The absolute y coordinate will be stored in this parameter.
+          * @since 0.1.0
+          */
+        virtual void getAbsolutePosition(int& x, int& y) const;
+
+        /**
+          * Sets the parent of the widget. A parent must be a BasicContainer.
+          *
+          * WARNING: This function is used internally and should not
+          *          be called or overloaded unless you know what you
+          *          are doing.
+          *
+          * @param parent The parent of the widget.
+          * @see getParent
+          * @since 0.1.0
+          */
+        virtual void _setParent(Widget* parent);
+
+        /**
+          * Gets the font set for the widget. If no font has been set, 
+          * the global font will be returned. If no global font has been set, 
+          * the default font will be returend.
+          *
+          * @return The font set for the widget.
+          * @see setFont, setGlobalFont
+          * @since 0.1.0
+          */
+        Font *getFont() const A_WARN_UNUSED;
+
+        /**
+          * Sets the global font to be used by default for all widgets.
+          *
+          * @param font The global font.
+          * @see getGlobalFont
+          * @since 0.1.0
+          */
+        static void setGlobalFont(Font* font);
+
+        /**
+          * Sets the font for the widget. If NULL is passed, the global font 
+          * will be used.
+          *
+          * @param font The font to set for the widget.
+          * @see getFont
+          * @since 0.1.0
+          */
+        void setFont(Font* font);
+
+        /**
+          * Called when the font has changed. If the change is global,
+          * this function will only be called if the widget doesn't have a
+          * font already set.
+          *
+          * @since 0.1.0
+          */
+        virtual void fontChanged()
+        { }
+
+        /**
+          * Checks if a widget exists or not, that is if it still exists
+          * an instance of the object.
+          *
+          * @param widget The widget to check.
+          * @return True if an instance of the widget exists, false otherwise.
+          * @since 0.1.0
+          */
+        static bool widgetExists(const Widget* widget) A_WARN_UNUSED;
+
+        /**
+          * Checks if tab in is enabled. Tab in means that you can set focus
+          * to this widget by pressing the tab button. If tab in is disabled
+          * then the focus handler will skip this widget and focus the next
+          * in its focus order.
+          *
+          * @return True if tab in is enabled, false otherwise.
+          * @see setTabInEnabled
+          * @since 0.1.0
+          */
+        bool isTabInEnabled() const A_WARN_UNUSED;
+
+        /**
+          * Sets tab in enabled, or not. Tab in means that you can set focus
+          * to this widget by pressing the tab button. If tab in is disabled
+          * then the FocusHandler will skip this widget and focus the next
+          * in its focus order.
+          *
+          * @param enabled True if tab in should be enabled, false otherwise.
+          * @see isTabInEnabled
+          * @since 0.1.0
+          */
+        void setTabInEnabled(bool enabled);
+
+        /**
+          * Checks if tab out is enabled. Tab out means that you can lose
+          * focus to this widget by pressing the tab button. If tab out is
+          * disabled then the FocusHandler ignores tabbing and focus will
+          * stay with this widget.
+          *
+          * @return True if tab out is enabled, false otherwise.
+          * @see setTabOutEnabled
+          * @since 0.1.0
+          */
+        bool isTabOutEnabled() const A_WARN_UNUSED;
+
+        /**
+          * Sets tab out enabled. Tab out means that you can lose
+          * focus to this widget by pressing the tab button. If tab out is
+          * disabled then the FocusHandler ignores tabbing and focus will
+          * stay with this widget.
+          *
+          * @param enabled True if tab out should be enabled, false otherwise.
+          * @see isTabOutEnabled
+          * @since 0.1.0
+          */
+        void setTabOutEnabled(bool enabled);
+
+        /**
+          * Requests modal focus. When a widget has modal focus, only that
+          * widget and it's children may recieve input.
+          *
+          * @throws Exception if another widget already has modal focus.
+          * @see releaseModalFocus, isModalFocused
+          * @since 0.4.0
+          */
+        virtual void requestModalFocus();
+
+        /**
+          * Requests modal mouse input focus. When a widget has modal input focus
+          * that widget will be the only widget receiving input even if the input
+          * occurs outside of the widget and no matter what the input is.
+          *
+          * @throws Exception if another widget already has modal focus.
+          * @see releaseModalMouseInputFocus, isModalMouseInputFocused
+          * @since 0.6.0
+          */
+        virtual void requestModalMouseInputFocus();
+
+        /**
+          * Releases modal focus. Modal focus will only be released if the
+          * widget has modal focus.
+          *
+          * @see requestModalFocus, isModalFocused
+          * @since 0.4.0
+          */
+        virtual void releaseModalFocus();
+
+        /**
+          * Releases modal mouse input focus. Modal mouse input focus will only
+          * be released if the widget has modal mouse input focus.
+          *
+          * @see requestModalMouseInputFocus, isModalMouseInputFocused
+          * @since 0.6.0
+          */
+        virtual void releaseModalMouseInputFocus();
+
+        /**
+          * Checks if the widget or it's parent has modal focus.
+          *
+          * @return True if the widget has modal focus, false otherwise.
+          * @see requestModalFocus, releaseModalFocus
+          * @since 0.8.0
+          */
+        virtual bool isModalFocused() const A_WARN_UNUSED;
+
+        /**
+          * Checks if the widget or it's parent has modal mouse input focus.
+          *
+          * @return True if the widget has modal mouse input focus, false
+          *         otherwise.
+          * @see requestModalMouseInputFocus, releaseModalMouseInputFocus
+          * @since 0.8.0
+          */
+        virtual bool isModalMouseInputFocused() const A_WARN_UNUSED;
+
+        /**
+          * Gets a widget from a certain position in the widget.
+          * This function is used to decide which gets mouse input,
+          * thus it can be overloaded to change that behaviour.
+          *
+          * NOTE: This always returns NULL if the widget is not
+          *       a container.
+          *
+          * @param x The x coordinate of the widget to get.
+          * @param y The y coordinate of the widget to get.
+          * @return The widget at the specified coodinate, NULL
+          *         if no widget is found.
+          * @since 0.6.0
+          */
+        virtual Widget *getWidgetAt(int x, int y) A_WARN_UNUSED;
+
+        /**
+          * Gets the mouse listeners of the widget.
+          *
+          * @return The mouse listeners of the widget.
+          * @since 0.6.0
+          */
+        virtual const std::list<MouseListener*>& _getMouseListeners()
+                                                  A_WARN_UNUSED;
+
+        /**
+          * Gets the key listeners of the widget.
+          *
+          * @return The key listeners of the widget.
+          * @since 0.6.0
+          */
+        virtual const std::list<KeyListener*>& _getKeyListeners()
+                                                A_WARN_UNUSED;
+
+        /**
+          * Gets the focus listeners of the widget.
+          *
+          * @return The focus listeners of the widget.
+          * @since 0.7.0
+          */
+        virtual const std::list<FocusListener*>& _getFocusListeners()
+                                                  A_WARN_UNUSED;
+
+        /**
+          * Gets the area of the widget occupied by the widget's children.
+          * By default this method returns an empty rectangle as not all
+          * widgets are containers. If you want to make a container this
+          * method should return the area where the children resides. This
+          * method is used when drawing children of a widget when computing
+          * clip rectangles for the children.
+          *
+          * An example of a widget that overloads this method is ScrollArea.
+          * A ScrollArea has a view of its contant and that view is the
+          * children area. The size of a ScrollArea's children area might
+          * vary depending on if the scroll bars of the ScrollArea is shown
+          * or not.
+          *
+          * @return The area of the widget occupied by the widget's children.
+          * @see BasicContainer
+          * @see BasicContainer::getChildrenArea
+          * @see BasicContainer::drawChildren
+          * @since 0.1.0
+          */
+        virtual Rect getChildrenArea() A_WARN_UNUSED;
+
+        /**
+          * Gets the internal focus handler used.
+          *
+          * @return the internalFocusHandler used. If no internal focus handler
+          *         is used, NULL will be returned.
+          * @see setInternalFocusHandler
+          * @since 0.1.0
+          */
+        virtual FocusHandler* _getInternalFocusHandler() A_WARN_UNUSED;
+
+        /**
+          * Sets the internal focus handler. An internal focus handler is
+          * needed if both a widget in the widget and the widget itself
+          * should be foucsed at the same time.
+          *
+          * @param focusHandler The internal focus handler to be used.
+          * @see getInternalFocusHandler
+          * @since 0.1.0
+          */
+        void setInternalFocusHandler(FocusHandler* internalFocusHandler);
+
+        /**
+          * Moves a widget to the top of this widget. The moved widget will be
+          * drawn above all other widgets in this widget.
+          *
+          * @param widget The widget to move to the top.
+          * @see moveToBottom
+          * @since 0.1.0
+          */
+        virtual void moveToTop(Widget* widget A_UNUSED)
+        { }
+
+        /**
+          * Moves a widget in this widget to the bottom of this widget.
+          * The moved widget will be drawn below all other widgets in this widget.
+          *
+          * @param widget The widget to move to the bottom.
+          * @see moveToTop
+          * @since 0.1.0
+          */
+        virtual void moveToBottom(Widget* widget A_UNUSED)
+        { }
+
+        /**
+          * Focuses the next widget in the widget.
+          * 
+          * @see moveToBottom
+          * @since 0.1.0
+          */
+        virtual void focusNext()
+        { }
+
+        /**
+          * Focuses the previous widget in the widget.
+          *
+          * @see moveToBottom
+          * @since 0.1.0
+          */
+        virtual void focusPrevious()
+        { }
+
+        /**
+          * Tries to show a specific part of a widget by moving it. Used if the
+          * widget should act as a container.
+          *
+          * @param widget The target widget.
+          * @param area The area to show.
+          * @since 0.1.0
+          */
+        virtual void showWidgetPart(Widget* widget A_UNUSED,
+                                    Rect area A_UNUSED)
+        { }
+
+        /**
+          * Sets an id of a widget. An id can be useful if a widget needs to be
+          * identified in a container. For example, if widgets are created by an
+          * XML document, a certain widget can be retrieved given that the widget
+          * has an id.
+          *
+          * @param id The id to set to the widget.
+          * @see getId, BasicContainer::findWidgetById
+          * @since 0.8.0
+          */
+        void setId(const std::string& id)
+        { mId = id; }
+
+        /**
+          * Gets the id of a widget. An id can be useful if a widget needs to be
+          * identified in a container. For example, if widgets are created by an
+          * XML document, a certain widget can be retrieved given that the widget
+          * has an id.
+          *
+          * @param id The id to set to the widget.
+          * @see setId, BasicContainer::findWidgetById
+          * @since 0.8.0
+          */
+        const std::string& getId() const A_WARN_UNUSED
+        { return mId; }
+
+        /**
+          * Shows a certain part of a widget in the widget's parent.
+          * Used when widgets want a specific part to be visible in
+          * its parent. An example is a TextArea that wants a specific
+          * part of its text to be visible when a TextArea is a child
+          * of a ScrollArea.
+          *
+          * @param rectangle The rectangle to be shown.
+          * @since 0.8.0
+          */
+        virtual void showPart(Rect rectangle);
+
+    protected:
+        /**
+          * Distributes an action event to all action listeners
+          * of the widget.
+          *
+          * @since 0.8.0
+          */
+        void distributeActionEvent();
+
+        /**
+          * Distributes resized events to all of the widget's listeners.
+          *
+          * @since 0.8.0
+          */
+        void distributeResizedEvent();
+
+        /**
+          * Distributes moved events to all of the widget's listeners.
+          *
+          * @since 0.8.0
+          */
+        void distributeMovedEvent();
+
+        /**
+          * Distributes hidden events to all of the widget's listeners.
+          *
+          * @since 0.8.0
+          * @author Olof Naessén
+          */
+        void distributeHiddenEvent();
+
+        /**
+          * Distributes shown events to all of the widget's listeners.
+          *
+          * @since 0.8.0
+          * @author Olof Naessén
+          */
+        void distributeShownEvent();
+
+        /**
+          * Typdef.
+          */
+        typedef std::list<MouseListener*> MouseListenerList;
+
+        /**
+          * Typdef.
+          */
+        typedef MouseListenerList::iterator MouseListenerIterator;
+
+        /**
+          * Holds the mouse listeners of the widget.
+          */
+        MouseListenerList mMouseListeners;
+
+        /**
+          * Typdef.
+          */
+        typedef std::list<KeyListener*> KeyListenerList;
+
+        /**
+          * Holds the key listeners of the widget.
+          */
+        KeyListenerList mKeyListeners;
+
+        /**
+          * Typdef.
+          */
+        typedef KeyListenerList::iterator KeyListenerIterator;
+
+        /**
+          * Typdef.
+          */
+        typedef std::list<ActionListener*> ActionListenerList;
+
+        /** 
+          * Holds the action listeners of the widget.
+          */
+        ActionListenerList mActionListeners;
+
+        /**
+          * Typdef.
+          */
+        typedef ActionListenerList::iterator ActionListenerIterator;
+
+        /**
+          * Typdef.
+          */
+        typedef std::list<DeathListener*> DeathListenerList;
+
+        /**
+          * Holds the death listeners of the widget.
+          */ 
+        DeathListenerList mDeathListeners;
+
+        /**
+          * Typdef.
+          */
+        typedef DeathListenerList::iterator DeathListenerIterator;
+
+        /**
+          * Typdef.
+          */
+        typedef std::list<FocusListener*> FocusListenerList;
+
+        /**
+          * Holds the focus listeners of the widget.
+          */
+        FocusListenerList mFocusListeners;
+
+        /**
+          * Typdef.
+          */
+        typedef FocusListenerList::iterator FocusListenerIterator;
+
+        typedef std::list<WidgetListener*> WidgetListenerList;
+
+        /**
+          * Holds the widget listeners of the widget.
+          */
+        WidgetListenerList mWidgetListeners;
+
+        /**
+          * Typdef.
+          */
+        typedef WidgetListenerList::iterator WidgetListenerIterator;
+
+        /**
+          * Holds the foreground color of the widget.
+          */
+        Color mForegroundColor;
+
+        /**
+          * Holds the background color of the widget.
+          */
+        Color mBackgroundColor;
+
+        /**
+          * Holds the base color of the widget.
+          */
+        Color mBaseColor;
+
+        /**
+          * Holds the selection color of the widget.
+          */
+        Color mSelectionColor;
+
+        /**
+          * Holds the focus handler used by the widget.
+          */
+        FocusHandler* mFocusHandler;
+
+        /**
+          * Holds the focus handler used by the widget. NULL
+          * if no internal focus handler is used.
+          */
+        FocusHandler* mInternalFocusHandler;
+
+        /**
+          * Holds the parent of the widget. NULL if the widget
+          * has no parent.
+          */
+        Widget* mParent;
+
+        /**
+          * Holds the dimension of the widget.
+          */
+        Rect mDimension;
+
+        /** 
+          * Holds the frame size of the widget.
+          */
+        unsigned int mFrameSize;
+
+        /**
+          * Holds the action event of the widget.
+          */
+        std::string mActionEventId;
+
+        /**
+          * True if the widget focusable, false otherwise.
+          */
+        bool mFocusable;
+
+        /**
+          * True if the widget visible, false otherwise.
+          */
+        bool mVisible;
+
+        /**
+          * True if the widget has tab in enabled, false otherwise.
+          */
+        bool mTabIn;
+
+        /**
+          * True if the widget has tab in enabled, false otherwise.
+          */
+        bool mTabOut;
+
+        /**
+          * True if the widget is enabled, false otherwise.
+          */
+        bool mEnabled;
+
+        /**
+          * Holds the id of the widget.
+          */
+        std::string mId;
+
+        /**
+          * Holds the font used by the widget.
+          */
+        Font* mCurrentFont;
+
+        /**
+          * Holds the global font used by the widget.
+          */
+        static Font* mGlobalFont;
+
+        /**
+          * Holds a list of all instances of widgets.
+          */
+        static std::list<Widget*> mWidgets;
+
+        static std::set<Widget*> mWidgetsSet;
+};
+
+#endif  // GUI_WIDGETS_WIDGET_H
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index f6e94556a..ff565815f 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -21,7 +21,6 @@
 #ifndef GUI_WIDGETS_WIDGET2_H
 #define GUI_WIDGETS_WIDGET2_H
 
-#include "gui/gui.h"
 #include "gui/theme.h"
 
 #include "render/renderers.h"
@@ -33,16 +32,16 @@ class Widget2
         {
         }
 
-        inline const gcn::Color &getThemeColor(const int type,
-                                               const int alpha = 255)
-                                               const A_WARN_UNUSED
+        inline const Color &getThemeColor(const int type,
+                                          const int alpha = 255)
+                                          const A_WARN_UNUSED
         {
             return Theme::getThemeColor(mPaletteOffset + type, alpha);
         }
 
-        inline const gcn::Color &getThemeCharColor(const signed char c,
-                                                   bool &valid)
-                                                   const A_WARN_UNUSED
+        inline const Color &getThemeCharColor(const signed char c,
+                                              bool &valid)
+                                              const A_WARN_UNUSED
         {
             const int colorId = Theme::getThemeIdByChar(c, valid);
             if (valid)
@@ -72,18 +71,12 @@ class Widget2
             }
         }
 
-        void setForegroundColor2(const gcn::Color &color)
+        void setForegroundColor2(const Color &color)
         {
             mForegroundColor2 = color;
         }
 
     protected:
-        Widget2() :
-            mPaletteOffset(0),
-            mForegroundColor2()
-        {
-        }
-
         explicit Widget2(const Widget2 *const widget) :
             mPaletteOffset(widget ? widget->mPaletteOffset : 0),
             mForegroundColor2()
@@ -92,7 +85,7 @@ class Widget2
         }
 
         int mPaletteOffset;
-        gcn::Color mForegroundColor2;
+        Color mForegroundColor2;
 };
 
 extern RenderType openGLMode;
diff --git a/src/gui/widgets/widgetgroup.cpp b/src/gui/widgets/widgetgroup.cpp
index 34cbeebb5..07c4df43c 100644
--- a/src/gui/widgets/widgetgroup.cpp
+++ b/src/gui/widgets/widgetgroup.cpp
@@ -23,11 +23,12 @@
 #include "debug.h"
 
 WidgetGroup::WidgetGroup(const Widget2 *const widget,
-                         const std::string &group, const int height,
+                         const std::string &group,
+                         const int height,
                          const int spacing) :
     Container(widget),
-    gcn::WidgetListener(),
-    gcn::ActionListener(),
+    WidgetListener(),
+    ActionListener(),
     mSpacing(spacing),
     mCount(0),
     mGroup(group),
@@ -57,7 +58,7 @@ void WidgetGroup::addButton(const std::string &restrict text,
     }
 }
 
-void WidgetGroup::action(const gcn::ActionEvent &event)
+void WidgetGroup::action(const ActionEvent &event)
 {
     for (ActionListenerIterator iter = mActionListeners.begin();
          iter != mActionListeners.end(); ++iter)
@@ -66,7 +67,7 @@ void WidgetGroup::action(const gcn::ActionEvent &event)
     }
 }
 
-void WidgetGroup::add(gcn::Widget *const widget, const int spacing)
+void WidgetGroup::add(Widget *const widget, const int spacing)
 {
     if (!widget)
         return;
@@ -84,6 +85,6 @@ void WidgetGroup::clear()
     mCount = 0;
 }
 
-void WidgetGroup::widgetResized(const gcn::Event &event A_UNUSED)
+void WidgetGroup::widgetResized(const Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 3d63b02f8..051234cda 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -23,14 +23,14 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
 class WidgetGroup : public Container,
-                    public gcn::WidgetListener,
-                    public gcn::ActionListener
+                    public WidgetListener,
+                    public ActionListener
 {
     public:
         A_DELETE_COPY(WidgetGroup)
@@ -40,21 +40,22 @@ class WidgetGroup : public Container,
         virtual void addButton(const std::string &restrict text,
                                const std::string &restrict tag);
 
-        void action(const gcn::ActionEvent &event) override;
+        void action(const ActionEvent &event) override;
 
-        virtual void add(gcn::Widget *const widget,
+        virtual void add(Widget *const widget,
                          const int spacing);
 
         virtual void clear();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         virtual Widget *createWidget(const std::string &name)
                                      const A_WARN_UNUSED = 0;
 
     protected:
         WidgetGroup(const Widget2 *const widget,
-                    const std::string &group, const int height,
+                    const std::string &group,
+                    const int height,
                     const int spacing);
 
         int mSpacing;
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 36372dcaa..ec83af9a8 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gui/widgets/window.h"
 
 #include "client.h"
@@ -29,6 +72,8 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "gui/focushandler.h"
+#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
@@ -37,10 +82,6 @@
 #include "resources/cursor.h"
 #include "resources/image.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 const int resizeMask = 8 + 4 + 2 + 1;
@@ -50,9 +91,17 @@ int Window::mouseResize = 0;
 
 Window::Window(const std::string &caption, const bool modal,
                Window *const parent, std::string skin) :
-    gcn::Window(caption),
-    Widget2(),
-    gcn::WidgetListener(),
+    gcn::Container(nullptr),
+    MouseListener(),
+    WidgetListener(),
+    mCaption(caption),
+    mAlignment(Graphics::CENTER),
+    mPadding(2),
+    mTitleBarHeight(16),
+    mMovable(true),
+    mDragOffsetX(0),
+    mDragOffsetY(0),
+    mMoved(false),
     mSkin(nullptr),
     mDefaultX(0),
     mDefaultY(0),
@@ -74,7 +123,7 @@ Window::Window(const std::string &caption, const bool modal,
     mVertexes(new ImageCollection),
     mCaptionOffsetX(7),
     mCaptionOffsetY(5),
-    mCaptionAlign(gcn::Graphics::LEFT),
+    mCaptionAlign(Graphics::LEFT),
     mTitlePadding(4),
     mGripPadding(2),
     mResizeHandles(-1),
@@ -92,16 +141,11 @@ Window::Window(const std::string &caption, const bool modal,
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
-#ifndef USE_INTERNALGUICHAN
-    mDragOffsetX = 0;
-    mDragOffsetY = 0;
-#endif
-
-    if (!windowContainer)
-        throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
-
     windowInstances++;
 
+//    mFrameSize = 1;
+    addMouseListener(this);
+
     setFrameSize(0);
     setPadding(3);
     setTitleBarHeight(20);
@@ -119,7 +163,7 @@ Window::Window(const std::string &caption, const bool modal,
         {
             setPadding(mSkin->getPadding());
             if (getOptionBool("titlebarBold"))
-                mCaptionFont = reinterpret_cast<gcn::Font*>(boldFont);
+                mCaptionFont = boldFont;
             mTitlePadding = mSkin->getTitlePadding();
             mGripPadding = getOption("resizePadding");
             mCaptionOffsetX = getOption("captionoffsetx");
@@ -128,12 +172,12 @@ Window::Window(const std::string &caption, const bool modal,
             mCaptionOffsetY = getOption("captionoffsety");
             if (!mCaptionOffsetY)
                 mCaptionOffsetY = 5;
-            mCaptionAlign = static_cast<gcn::Graphics::Alignment>(
+            mCaptionAlign = static_cast<Graphics::Alignment>(
                 getOption("captionalign"));
-            if (mCaptionAlign < gcn::Graphics::LEFT
-                || mCaptionAlign > gcn::Graphics::RIGHT)
+            if (mCaptionAlign < Graphics::LEFT
+                || mCaptionAlign > Graphics::RIGHT)
             {
-                mCaptionAlign = gcn::Graphics::LEFT;
+                mCaptionAlign = Graphics::LEFT;
             }
             setTitleBarHeight(getOption("titlebarHeight"));
             if (!mTitleBarHeight)
@@ -147,7 +191,8 @@ Window::Window(const std::string &caption, const bool modal,
     }
 
     // Add this window to the window container
-    windowContainer->add(this);
+    if (windowContainer)
+        windowContainer->add(this);
 
     if (mModal)
     {
@@ -208,13 +253,12 @@ void Window::setWindowContainer(WindowContainer *const wc)
     windowContainer = wc;
 }
 
-void Window::draw(gcn::Graphics *graphics)
+void Window::draw(Graphics *graphics)
 {
     if (!mSkin)
         return;
 
     BLOCK_START("Window::draw")
-    Graphics *const g = static_cast<Graphics*>(graphics);
     bool update = false;
 
     if (isBatchDrawRenders(openGLMode))
@@ -230,8 +274,11 @@ void Window::draw(gcn::Graphics *graphics)
             mRedraw = false;
             update = true;
             mVertexes->clear();
-            g->calcWindow(mVertexes, 0, 0, mDimension.width,
-                mDimension.height, mSkin->getBorder());
+            graphics->calcWindow(mVertexes,
+                0, 0,
+                mDimension.width,
+                mDimension.height,
+                mSkin->getBorder());
 
             // Draw Close Button
             if (mCloseWindowButton)
@@ -240,8 +287,10 @@ void Window::draw(gcn::Graphics *graphics)
                     mResizeHandles == CLOSE);
                 if (button)
                 {
-                    g->calcTileCollection(mVertexes, button,
-                        mCloseRect.x, mCloseRect.y);
+                    graphics->calcTileCollection(mVertexes,
+                        button,
+                        mCloseRect.x,
+                        mCloseRect.y);
                 }
             }
             // Draw Sticky Button
@@ -250,27 +299,33 @@ void Window::draw(gcn::Graphics *graphics)
                 const Image *const button = mSkin->getStickyImage(mSticky);
                 if (button)
                 {
-                    g->calcTileCollection(mVertexes, button,
-                        mStickyRect.x, mStickyRect.y);
+                    graphics->calcTileCollection(mVertexes,
+                        button,
+                        mStickyRect.x,
+                        mStickyRect.y);
                 }
             }
 
             if (mGrip)
             {
-                g->calcTileCollection(mVertexes, mGrip,
-                    mGripRect.x, mGripRect.y);
+                graphics->calcTileCollection(mVertexes,
+                    mGrip,
+                    mGripRect.x,
+                    mGripRect.y);
             }
         }
         else
         {
             mLastRedraw = false;
         }
-        g->drawTileCollection(mVertexes);
+        graphics->drawTileCollection(mVertexes);
     }
     else
     {
-        g->drawImageRect(0, 0, mDimension.width,
-            mDimension.height, mSkin->getBorder());
+        graphics->drawImageRect(0, 0,
+            mDimension.width,
+            mDimension.height,
+            mSkin->getBorder());
 
         // Draw Close Button
         if (mCloseWindowButton)
@@ -278,24 +333,24 @@ void Window::draw(gcn::Graphics *graphics)
             const Image *const button = mSkin->getCloseImage(
                 mResizeHandles == CLOSE);
             if (button)
-                g->drawImage2(button, mCloseRect.x, mCloseRect.y);
+                graphics->drawImage(button, mCloseRect.x, mCloseRect.y);
         }
         // Draw Sticky Button
         if (mStickyButton)
         {
             const Image *const button = mSkin->getStickyImage(mSticky);
             if (button)
-                g->drawImage2(button, mStickyRect.x, mStickyRect.y);
+                graphics->drawImage(button, mStickyRect.x, mStickyRect.y);
         }
 
         if (mGrip)
-            g->drawImage2(mGrip, mGripRect.x, mGripRect.y);
+            graphics->drawImage(mGrip, mGripRect.x, mGripRect.y);
     }
 
     // Draw title
     if (mShowTitle)
     {
-        g->setColorAll(mForegroundColor, mForegroundColor2);
+        graphics->setColorAll(mForegroundColor, mForegroundColor2);
         int x;
         switch (mCaptionAlign)
         {
@@ -310,14 +365,14 @@ void Window::draw(gcn::Graphics *graphics)
                 x = mCaptionOffsetX - mCaptionFont->getWidth(mCaption);
                 break;
         }
-        mCaptionFont->drawString(g, mCaption, x, mCaptionOffsetY);
+        mCaptionFont->drawString(graphics, mCaption, x, mCaptionOffsetY);
     }
 
     if (update)
     {
-        g->setRedraw(update);
+        graphics->setRedraw(update);
         drawChildren(graphics);
-        g->setRedraw(false);
+        graphics->setRedraw(false);
     }
     else
     {
@@ -343,7 +398,7 @@ void Window::setContentSize(int width, int height)
     setSize(width, height);
 }
 
-void Window::setLocationRelativeTo(const gcn::Widget *const widget)
+void Window::setLocationRelativeTo(const Widget *const widget)
 {
     if (!widget)
         return;
@@ -360,7 +415,7 @@ void Window::setLocationRelativeTo(const gcn::Widget *const widget)
         - mDimension.height) / 2 - y));
 }
 
-void Window::setLocationHorisontallyRelativeTo(const gcn::Widget *const widget)
+void Window::setLocationHorisontallyRelativeTo(const Widget *const widget)
 {
     if (!widget)
         return;
@@ -485,9 +540,9 @@ void Window::setResizable(const bool r)
     }
 }
 
-void Window::widgetResized(const gcn::Event &event A_UNUSED)
+void Window::widgetResized(const Event &event A_UNUSED)
 {
-    const gcn::Rectangle area = getChildrenArea();
+    const Rect area = getChildrenArea();
 
     if (mGrip)
     {
@@ -549,12 +604,12 @@ void Window::widgetResized(const gcn::Event &event A_UNUSED)
     mRedraw = true;
 }
 
-void Window::widgetMoved(const gcn::Event& event A_UNUSED)
+void Window::widgetMoved(const Event& event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Window::widgetHidden(const gcn::Event &event A_UNUSED)
+void Window::widgetHidden(const Event &event A_UNUSED)
 {
     if (gui)
         gui->setCursorType(Cursor::CURSOR_POINTER);
@@ -608,25 +663,21 @@ void Window::setVisible(const bool visible, const bool forceSticky)
 
     // Check if the window is off screen...
     if (visible)
-    {
         ensureOnScreen();
-    }
     else
-    {
         mResizeHandles = 0;
-    }
 
     if (mStickyButtonLock)
-        gcn::Window::setVisible(visible);
+        gcn::Container::setVisible(visible);
     else
-        gcn::Window::setVisible((!forceSticky && mSticky) || visible);
+        gcn::Container::setVisible((!forceSticky && mSticky) || visible);
     if (visible)
     {
         if (mPlayVisibleSound)
             soundManager.playGuiSound(SOUND_SHOW_WINDOW);
         if (gui)
         {
-            gcn::MouseEvent *const event = reinterpret_cast<gcn::MouseEvent*>(
+            MouseEvent *const event = reinterpret_cast<MouseEvent*>(
                 gui->createMouseEvent(this));
             if (event)
             {
@@ -653,12 +704,19 @@ void Window::scheduleDelete()
     windowContainer->scheduleDelete(this);
 }
 
-void Window::mousePressed(gcn::MouseEvent &event)
+void Window::mousePressed(MouseEvent &event)
 {
-    // Let Guichan move window to top and figure out title bar drag
-    gcn::Window::mousePressed(event);
+    if (event.getSource() == this)
+    {
+        if (getParent())
+            getParent()->moveToTop(this);
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+        mDragOffsetX = event.getX();
+        mDragOffsetY = event.getY();
+        mMoved = event.getY() <= static_cast<int>(mTitleBarHeight);
+    }
+
+    if (event.getButton() == MouseEvent::LEFT)
     {
         const int x = event.getX();
         const int y = event.getY();
@@ -696,7 +754,7 @@ void Window::close()
     setVisible(false);
 }
 
-void Window::mouseReleased(gcn::MouseEvent &event A_UNUSED)
+void Window::mouseReleased(MouseEvent &event A_UNUSED)
 {
     if (mGrip && mouseResize)
     {
@@ -705,22 +763,21 @@ void Window::mouseReleased(gcn::MouseEvent &event A_UNUSED)
             gui->setCursorType(Cursor::CURSOR_POINTER);
     }
 
-    // This should be the responsibility of Guichan (and is from 0.8.0 on)
     mMoved = false;
 }
 
-void Window::mouseEntered(gcn::MouseEvent &event)
+void Window::mouseEntered(MouseEvent &event)
 {
     updateResizeHandler(event);
 }
 
-void Window::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void Window::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mGrip && !mouseResize && gui)
         gui->setCursorType(Cursor::CURSOR_POINTER);
 }
 
-void Window::updateResizeHandler(gcn::MouseEvent &event)
+void Window::updateResizeHandler(MouseEvent &event)
 {
     if (!gui)
         return;
@@ -755,7 +812,7 @@ void Window::updateResizeHandler(gcn::MouseEvent &event)
     }
 }
 
-void Window::mouseMoved(gcn::MouseEvent &event)
+void Window::mouseMoved(MouseEvent &event)
 {
     updateResizeHandler(event);
     if (viewport)
@@ -767,12 +824,20 @@ bool Window::canMove() const
     return !mStickyButtonLock || !mSticky;
 }
 
-void Window::mouseDragged(gcn::MouseEvent &event)
+void Window::mouseDragged(MouseEvent &event)
 {
     if (canMove())
     {
-        // Let Guichan handle title bar drag
-        gcn::Window::mouseDragged(event);
+        if (!event.isConsumed() && event.getSource() == this)
+        {
+            if (isMovable() && mMoved)
+            {
+                setPosition(event.getX() - mDragOffsetX + getX(),
+                    event.getY() - mDragOffsetY + getY());
+            }
+
+            event.consume();
+        }
     }
     else
     {
@@ -794,7 +859,7 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     {
         const int dx = event.getX() - mDragOffsetX;
         const int dy = event.getY() - mDragOffsetY;
-        gcn::Rectangle newDim = getDimension();
+        Rect newDim = getDimension();
 
         if (mouseResize & (TOP | BOTTOM))
         {
@@ -1080,10 +1145,10 @@ void Window::adjustSizeToScreen()
     if (mDimension.height > screenHeight)
         mDimension.height = screenHeight;
     if (oldWidth != mDimension.width || oldHeight != mDimension.height)
-        widgetResized(gcn::Event(this));
+        widgetResized(Event(this));
 }
 
-int Window::getResizeHandles(const gcn::MouseEvent &event)
+int Window::getResizeHandles(const MouseEvent &event)
 {
     if (event.getX() < 0 || event.getY() < 0)
         return 0;
@@ -1120,7 +1185,7 @@ int Window::getResizeHandles(const gcn::MouseEvent &event)
     return resizeHandles;
 }
 
-bool Window::isResizeAllowed(const gcn::MouseEvent &event) const
+bool Window::isResizeAllowed(const MouseEvent &event) const
 {
     const int y = event.getY();
 
@@ -1165,7 +1230,7 @@ void Window::clearLayout()
     }
 }
 
-LayoutCell &Window::place(const int x, const int y, gcn::Widget *const wg,
+LayoutCell &Window::place(const int x, const int y, Widget *const wg,
                           const int w, const int h)
 {
     add(wg);
@@ -1192,7 +1257,7 @@ void Window::redraw()
 {
     if (mLayout)
     {
-        const gcn::Rectangle area = getChildrenArea();
+        const Rect area = getChildrenArea();
         int w = area.width;
         int h = area.height;
         mLayout->reflow(w, h);
@@ -1228,12 +1293,12 @@ void Window::ensureOnScreen()
         mDimension.y = 0;
 }
 
-gcn::Rectangle Window::getWindowArea() const
+Rect Window::getWindowArea() const
 {
-    return gcn::Rectangle(mPadding,
-                          mPadding,
-                          mDimension.width - mPadding * 2,
-                          mDimension.height - mPadding * 2);
+    return Rect(mPadding,
+        mPadding,
+        mDimension.width - mPadding * 2,
+        mDimension.height - mPadding * 2);
 }
 
 int Window::getOption(const std::string &name, const int def) const
@@ -1255,6 +1320,37 @@ bool Window::getOptionBool(const std::string &name, const bool def) const
     return def;
 }
 
+Rect Window::getChildrenArea()
+{
+    return Rect(mPadding,
+        mTitleBarHeight,
+        mDimension.width - mPadding * 2,
+        mDimension.height - mPadding - mTitleBarHeight);
+}
+
+void Window::resizeToContent()
+{
+    int w = 0;
+    int h = 0;
+    for (WidgetListConstIterator it = mWidgets.begin();
+          it != mWidgets.end(); ++ it)
+    {
+        const Widget *const widget = *it;
+        const int x = widget->getX();
+        const int y = widget->getY();
+        const int width = widget->getWidth();
+        const int height = widget->getHeight();
+        if (x + width > w)
+            w = x + width;
+
+        if (y + height > h)
+            h = y + height;
+    }
+
+    setSize(w + 2 * mPadding,
+        h + mPadding + mTitleBarHeight);
+}
+
 #ifdef USE_PROFILER
 void Window::logic()
 {
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index bb0f19bb3..6369990bb 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -20,16 +20,58 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef GUI_WIDGETS_WINDOW_H
 #define GUI_WIDGETS_WINDOW_H
 
 #include "render/graphics.h"
 
-#include "gui/widgets/widget2.h"
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
 
-#include <guichan/widgetlistener.hpp>
-
-#include <guichan/widgets/window.hpp>
+#include "gui/base/widgets/container.hpp"
 
 #include "localconsts.h"
 
@@ -46,9 +88,9 @@ class WindowContainer;
  *
  * \ingroup GUI
  */
-class Window : public gcn::Window,
-               public Widget2,
-               private gcn::WidgetListener
+class Window : public gcn::Container,
+               public MouseListener,
+               private WidgetListener
 {
     public:
         /**
@@ -80,7 +122,7 @@ class Window : public gcn::Window,
         /**
          * Draws the window.
          */
-        void draw(gcn::Graphics *graphics) override;
+        void draw(Graphics *graphics) override;
 
         /**
          * Sets the size of this window.
@@ -90,12 +132,12 @@ class Window : public gcn::Window,
         /**
          * Sets the location relative to the given widget.
          */
-        void setLocationRelativeTo(const gcn::Widget *const widget);
+        void setLocationRelativeTo(const Widget *const widget);
 
         /**
          * Sets the location relative to the given widget (only horisontally)
          */
-        void setLocationHorisontallyRelativeTo(const gcn::Widget
+        void setLocationHorisontallyRelativeTo(const Widget
                                                *const widget);
 
         /**
@@ -114,14 +156,14 @@ class Window : public gcn::Window,
         /**
          * Called whenever the widget changes size.
          */
-        virtual void widgetResized(const gcn::Event &event) override;
+        virtual void widgetResized(const Event &event) override;
 
-        virtual void widgetMoved(const gcn::Event& event) override;
+        virtual void widgetMoved(const Event& event) override;
 
         /**
          * Called whenever the widget is hidden.
          */
-        virtual void widgetHidden(const gcn::Event &event) override;
+        virtual void widgetHidden(const Event &event) override;
 
         /**
          * Sets whether or not the window has a close button.
@@ -257,35 +299,35 @@ class Window : public gcn::Window,
         /**
          * Starts window resizing when appropriate.
          */
-        void mousePressed(gcn::MouseEvent &event) override;
+        void mousePressed(MouseEvent &event) override;
 
         /**
          * Implements window resizing and makes sure the window is not
          * dragged/resized outside of the screen.
          */
-        void mouseDragged(gcn::MouseEvent &event) override;
+        void mouseDragged(MouseEvent &event) override;
 
         /**
          * Implements custom cursor image changing context, based on mouse
          * relative position.
          */
-        void mouseMoved(gcn::MouseEvent &event) override;
+        void mouseMoved(MouseEvent &event) override;
 
         /**
          * When the mouse button has been let go, this ensures that the mouse
          * custom cursor is restored back to it's standard image.
          */
-        void mouseReleased(gcn::MouseEvent &event) override;
+        void mouseReleased(MouseEvent &event) override;
 
         /**
          * When the mouse leaves the window this ensures that the custom cursor
          * is restored back to it's standard image.
          */
-        void mouseExited(gcn::MouseEvent &event) override;
+        void mouseExited(MouseEvent &event) override;
 
-        void mouseEntered(gcn::MouseEvent &event) override;
+        void mouseEntered(MouseEvent &event) override;
 
-        void updateResizeHandler(gcn::MouseEvent &event);
+        void updateResizeHandler(MouseEvent &event);
 
         /**
          * Sets the name of the window. This is not the window title.
@@ -373,7 +415,7 @@ class Window : public gcn::Window,
         /**
          * Adds a widget to the window and sets it at given cell.
          */
-        LayoutCell &place(const int x, const int y, gcn::Widget *const wg,
+        LayoutCell &place(const int x, const int y, Widget *const wg,
                           const int w = 1, const int h = 1);
 
         /**
@@ -408,11 +450,11 @@ class Window : public gcn::Window,
          */
         int getGuiAlpha() const A_WARN_UNUSED;
 
-        gcn::Rectangle getWindowArea() const A_WARN_UNUSED;
+        Rect getWindowArea() const A_WARN_UNUSED;
 
-        bool isResizeAllowed(const gcn::MouseEvent &event) const A_WARN_UNUSED;
+        bool isResizeAllowed(const MouseEvent &event) const A_WARN_UNUSED;
 
-        void setCaptionFont(gcn::Font *font)
+        void setCaptionFont(Font *font)
         { mCaptionFont = font; }
 
         void enableVisibleSound(bool b)
@@ -421,6 +463,105 @@ class Window : public gcn::Window,
         bool isWindowVisible() const A_WARN_UNUSED
         { return mVisible; }
 
+        /**
+         * Sets the padding of the window. The padding is the distance between the
+         * window border and the content.
+         *
+         * @param padding The padding of the window.
+         * @see getPadding
+         */
+        void setPadding(unsigned int padding)
+        { mPadding = padding; }
+
+        /**
+         * Gets the padding of the window. The padding is the distance between the
+         * window border and the content.
+         *
+         * @return The padding of the window.
+         * @see setPadding
+         */
+        unsigned int getPadding() const
+        { return mPadding; }
+
+        /**
+         * Sets the title bar height.
+         *
+         * @param height The title height value.
+         * @see getTitleBarHeight
+         */
+        void setTitleBarHeight(unsigned int height)
+        { mTitleBarHeight = height; }
+
+        /**
+         * Gets the title bar height.
+         *
+         * @return The title bar height.
+         * @see setTitleBarHeight
+         */
+        unsigned int getTitleBarHeight()
+        { return mTitleBarHeight; }
+
+        /**
+         * Sets the caption of the window.
+         *
+         * @param caption The caption of the window.
+         * @see getCaption
+         */
+        void setCaption(const std::string& caption)
+        { mCaption = caption; }
+
+        /**
+         * Gets the caption of the window.
+         *
+         * @return the caption of the window.
+         * @see setCaption
+         */
+        const std::string& getCaption() const
+        { return mCaption; }
+
+        /**
+         * Sets the alignment of the caption.
+         *
+         * @param alignment The alignment of the caption.
+         * @see getAlignment, Graphics
+         */
+        void setAlignment(Graphics::Alignment alignment)
+        { mAlignment = alignment; }
+
+        /**
+         * Gets the alignment of the caption.
+         *
+         * @return The alignment of caption.
+         * @see setAlignment, Graphics
+         */
+        Graphics::Alignment getAlignment() const
+        { return mAlignment; }
+
+        /**
+         * Sets the window to be moveble or not.
+         *
+         * @param movable True if the window should be movable, false otherwise.
+         * @see isMovable
+         */
+        void setMovable(bool movable)
+        { mMovable = movable; }
+
+        /**
+         * Checks if the window is movable.
+         *
+         * @return True if the window is movable, false otherwise.
+         * @see setMovable
+         */
+        bool isMovable() const
+        { return mMovable; }
+
+        virtual Rect getChildrenArea();
+
+        /**
+         * Resizes the window to fit the content.
+         */
+        virtual void resizeToContent();
+
 #ifdef USE_PROFILER
         virtual void logic();
 #endif
@@ -440,6 +581,50 @@ class Window : public gcn::Window,
         int getTitlePadding() const A_WARN_UNUSED
         { return mTitlePadding; }
 
+        /**
+         * Holds the caption of the window.
+         */
+        std::string mCaption;
+
+        /**
+         * Holds the alignment of the caption.
+         */
+        Graphics::Alignment mAlignment;
+
+        /**
+         * Holds the padding of the window.
+         */ 
+        unsigned int mPadding;
+
+        /**
+         * Holds the title bar height of the window.
+         */
+        unsigned int mTitleBarHeight;
+
+        /**
+         * True if the window is movable, false otherwise.
+         */
+        bool mMovable;
+
+        /**
+         * Holds a drag offset as an x coordinate where the drag of the window
+         * started if the window is being dragged. It's used to move the window 
+         * correctly when dragged.
+         */
+        int mDragOffsetX;
+
+        /**
+         * Holds a drag offset as an y coordinate where the drag of the window
+         * started if the window is being dragged. It's used to move the window 
+         * correctly when dragged.
+         */
+        int mDragOffsetY;
+
+        /**
+         * True if the window is being moved, false otherwise.
+         */
+        bool mMoved;
+
         Skin *mSkin;                  /**< Skin in use by this window */
         int mDefaultX;                /**< Default window X position */
         int mDefaultY;                /**< Default window Y position */
@@ -474,14 +659,14 @@ class Window : public gcn::Window,
          *
          * @see ResizeHandles
          */
-        int getResizeHandles(const gcn::MouseEvent &event) A_WARN_UNUSED;
+        int getResizeHandles(const MouseEvent &event) A_WARN_UNUSED;
 
         Image *mGrip;                 /**< Resize grip */
         Window *mParent;              /**< The parent window */
         Layout *mLayout;              /**< Layout handler */
-        gcn::Rectangle mCloseRect;    /**< Close button rectangle */
-        gcn::Rectangle mStickyRect;   /**< Sticky button rectangle */
-        gcn::Rectangle mGripRect;     /**< Resize grip rectangle */
+        Rect mCloseRect;    /**< Close button rectangle */
+        Rect mStickyRect;   /**< Sticky button rectangle */
+        Rect mGripRect;     /**< Resize grip rectangle */
         std::string mWindowName;      /**< Name of the window */
         int mMinWinWidth;             /**< Minimum window width */
         int mMinWinHeight;            /**< Minimum window height */
@@ -501,12 +686,12 @@ class Window : public gcn::Window,
         ImageCollection *mVertexes;
         int mCaptionOffsetX;
         int mCaptionOffsetY;
-        gcn::Graphics::Alignment mCaptionAlign;
+        Graphics::Alignment mCaptionAlign;
         int mTitlePadding;
         int mGripPadding;
         int mResizeHandles;
         int mOldResizeHandles;
-        gcn::Font *mCaptionFont;
+        Font *mCaptionFont;
         bool mShowTitle;              /**< Window has a title bar */
         bool mModal;                  /**< Window is modal */
         bool mCloseWindowButton;      /**< Window has a close button */
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index d23f29bad..a9b556410 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -42,7 +42,7 @@ void WindowContainer::slowLogic()
     mDeathList.clear();
 }
 
-void WindowContainer::scheduleDelete(gcn::Widget *const widget)
+void WindowContainer::scheduleDelete(Widget *const widget)
 {
     if (widget)
         mDeathList.push_back(widget);
@@ -58,8 +58,8 @@ void WindowContainer::adjustAfterResize(const int oldScreenWidth,
     }
 }
 
-void WindowContainer::moveWidgetAfter(gcn::Widget *const after,
-                                      gcn::Widget *const widget)
+void WindowContainer::moveWidgetAfter(Widget *const after,
+                                      Widget *const widget)
 {
     const WidgetListIterator widgetIter = std::find(
         mWidgets.begin(), mWidgets.end(), widget);
@@ -79,7 +79,7 @@ void WindowContainer::moveWidgetAfter(gcn::Widget *const after,
 }
 
 #ifdef USE_PROFILER
-void WindowContainer::draw(gcn::Graphics* graphics)
+void WindowContainer::draw(Graphics* graphics)
 {
     BLOCK_START("WindowContainer::draw")
     Container::draw(graphics);
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index 2ee4ea37d..a822fadb5 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -44,7 +44,7 @@ class WindowContainer : public Container
          * Schedule a widget for deletion. It will be deleted at the start of
          * the next logic update.
          */
-        void scheduleDelete(gcn::Widget *const widget);
+        void scheduleDelete(Widget *const widget);
 
         /**
          * Ensures that all visible windows are on the screen after the screen
@@ -53,18 +53,18 @@ class WindowContainer : public Container
         void adjustAfterResize(const int oldScreenWidth,
                                const int oldScreenHeight);
 
-        void moveWidgetAfter(gcn::Widget *const before,
-                             gcn::Widget *const widget);
+        void moveWidgetAfter(Widget *const before,
+                             Widget *const widget);
 
 #ifdef USE_PROFILER
-        void draw(gcn::Graphics* graphics);
+        void draw(Graphics* graphics);
 #endif
 
     private:
         /**
          * List of widgets that are scheduled to be deleted.
          */
-        typedef std::vector<gcn::Widget*> Widgets;
+        typedef std::vector<Widget*> Widgets;
         typedef Widgets::iterator WidgetIterator;
         Widgets mDeathList;
 };
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index a094b5b08..795f2ad5a 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -31,9 +31,8 @@
 #include "gui/popups/textpopup.h"
 
 #include "gui/windows/skilldialog.h"
-#ifdef MANASERV_SUPPORT
-#include "gui/specialswindow.h"
-#endif
+
+#include "gui/widgets/button.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
@@ -44,9 +43,9 @@
 
 WindowMenu::WindowMenu(const Widget2 *const widget) :
     Container(widget),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
-    gcn::MouseListener(),
+    ActionListener(),
+    SelectionListener(),
+    MouseListener(),
     mSkin(Theme::instance() ? Theme::instance()->load("windowmenu.xml", "")
           : nullptr),
     mPadding(mSkin ? mSkin->getPadding() : 1),
@@ -109,15 +108,6 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
             _("Skills"), x, h, Input::KEY_WINDOW_SKILL);
     }
 
-#ifdef MANASERV_SUPPORT
-    if (Net::getNetworkType() == ServerInfo::MANASERV)
-    {
-        // TRANSLATORS: short button name for specials window.
-        addButton(N_("SPE"),
-            _("Specials"), x, h, Input::KEY_NO_VALUE);
-    }
-#endif
-
     // TRANSLATORS: short button name for social window.
     addButton(N_("SOC"),
     // TRANSLATORS: full button name
@@ -166,7 +156,7 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
 
     x += mPadding - mSpacing;
     if (mainGraphics)
-        setDimension(gcn::Rectangle(mainGraphics->mWidth - x, 0, x, h));
+        setDimension(Rect(mainGraphics->mWidth - x, 0, x, h));
 
     loadButtons();
 
@@ -213,7 +203,7 @@ WindowMenu::~WindowMenu()
     }
 }
 
-void WindowMenu::action(const gcn::ActionEvent &event)
+void WindowMenu::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
 
@@ -248,12 +238,12 @@ void WindowMenu::addButton(const char *const text,
         mButtonTexts.push_back(new ButtonText(description, key));
 }
 
-void WindowMenu::mousePressed(gcn::MouseEvent &event)
+void WindowMenu::mousePressed(MouseEvent &event)
 {
     if (!viewport)
         return;
 
-    if (!mSmallWindow && event.getButton() == gcn::MouseEvent::RIGHT)
+    if (!mSmallWindow && event.getButton() == MouseEvent::RIGHT)
     {
         Button *const btn = dynamic_cast<Button*>(event.getSource());
         if (!btn)
@@ -266,7 +256,7 @@ void WindowMenu::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void WindowMenu::mouseMoved(gcn::MouseEvent &event)
+void WindowMenu::mouseMoved(MouseEvent &event)
 {
     mHaveMouse = true;
 
@@ -291,7 +281,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event)
     const int x = event.getX();
     const int y = event.getY();
     const int key = btn->getTag();
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     if (key != Input::KEY_NO_VALUE)
     {
         mTextPopup->show(x + rect.x, y + rect.y, btn->getDescription(),
@@ -305,7 +295,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void WindowMenu::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
+void WindowMenu::mouseExited(MouseEvent& mouseEvent A_UNUSED)
 {
     mHaveMouse = false;
     if (!mTextPopup)
@@ -348,7 +338,7 @@ void WindowMenu::updateButtons()
     }
     x += mPadding - mSpacing;
     if (mainGraphics)
-        setDimension(gcn::Rectangle(mainGraphics->mWidth - x, 0, x, h));
+        setDimension(Rect(mainGraphics->mWidth - x, 0, x, h));
 }
 
 void WindowMenu::loadButtons()
@@ -419,7 +409,7 @@ void WindowMenu::saveButtons() const
         config.deleteKey("windowmenu" + toString(f));
 }
 
-void WindowMenu::drawChildren(gcn::Graphics* graphics)
+void WindowMenu::drawChildren(Graphics* graphics)
 {
     if (mHaveMouse || !mAutoHide || (mAutoHide == 1
         && mainGraphics && (mSmallWindow || mainGraphics->mWidth > 800)))
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 38ee090a7..a1ed66a7d 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -23,21 +23,21 @@
 #ifndef GUI_WINDOWMENU_H
 #define GUI_WINDOWMENU_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "gui/widgets/container.h"
-#include "gui/widgets/button.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/mouselistener.h"
+#include "listeners/selectionlistener.h"
 
 #include "localconsts.h"
 
 #include <map>
 #include <vector>
 
+class Button;
 class TextPopup;
-class Window;
 
 struct ButtonInfo final
 {
@@ -77,9 +77,9 @@ struct ButtonText final
  */
 class WindowMenu final : public Container,
                          public ConfigListener,
-                         public gcn::ActionListener,
-                         public gcn::SelectionListener,
-                         public gcn::MouseListener
+                         public ActionListener,
+                         public SelectionListener,
+                         public MouseListener
 {
     public:
         explicit WindowMenu(const Widget2 *const widget);
@@ -88,13 +88,13 @@ class WindowMenu final : public Container,
 
         ~WindowMenu();
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override final;
+        void mouseExited(MouseEvent& mouseEvent A_UNUSED) override final;
 
         std::map <std::string, ButtonInfo*> &getButtonNames() A_WARN_UNUSED
         { return mButtonNames; }
@@ -118,7 +118,7 @@ class WindowMenu final : public Container,
 #endif
 
     protected:
-        void drawChildren(gcn::Graphics* graphics) override final;
+        void drawChildren(Graphics* graphics) override final;
 
     private:
         inline void addButton(const char *const text,
diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp
index b94093ebb..d1fc0e7bd 100644
--- a/src/gui/windows/botcheckerwindow.cpp
+++ b/src/gui/windows/botcheckerwindow.cpp
@@ -101,7 +101,7 @@ public:
         freeWidgets();
         mPlayers.clear();
         if (actorManager && botCheckerWindow
-            && botCheckerWindow->mEnabled)
+            && botCheckerWindow->mBotcheckerEnabled)
         {
             std::set<ActorSprite*> beings = actorManager->getAll();
             FOR_EACH (ActorSprites::iterator, i, beings)
@@ -125,7 +125,7 @@ public:
                 continue;
 
             const Being *const player = mPlayers.at(r);
-            gcn::Widget *widget = new Label(this, player->getName());
+            Widget *widget = new Label(this, player->getName());
 
             mWidgets.push_back(widget);
 
@@ -235,14 +235,14 @@ public:
     {
     }
 
-    gcn::Widget *getElementAt(const int row, const int column) const
+    Widget *getElementAt(const int row, const int column) const
     {
         return mWidgets[WIDGET_AT(row, column)];
     }
 
     void freeWidgets()
     {
-        for (std::vector<gcn::Widget *>::const_iterator it = mWidgets.begin();
+        for (std::vector<Widget *>::const_iterator it = mWidgets.begin();
              it != mWidgets.end(); ++it)
         {
             delete *it;
@@ -253,17 +253,17 @@ public:
 
 protected:
     std::vector<Being*> mPlayers;
-    std::vector<gcn::Widget*> mWidgets;
+    std::vector<Widget*> mWidgets;
 };
 
 
 BotCheckerWindow::BotCheckerWindow():
     // TRANSLATORS: bot checker window header
     Window(_("Bot Checker"), false, nullptr, "botchecker.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mTableModel(new UsersTableModel(this)),
     mTable(new GuiTable(this, mTableModel)),
-    playersScrollArea(new ScrollArea(mTable, true,
+    playersScrollArea(new ScrollArea(this, mTable, true,
         "bochecker_background.xml")),
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
     mPlayerTitleTable(new GuiTable(this, mPlayerTableTitleModel)),
@@ -271,7 +271,7 @@ BotCheckerWindow::BotCheckerWindow():
     mIncButton(new Button(this, _("Reset"), "reset", this)),
     mLastUpdateTime(0),
     mNeedUpdate(false),
-    mEnabled(false)
+    mBotcheckerEnabled(false)
 {
     const int w = 500;
     const int h = 250;
@@ -346,7 +346,7 @@ BotCheckerWindow::BotCheckerWindow():
     enableVisibleSound(true);
 
     config.addListener("enableBotCheker", this);
-    mEnabled = config.getBoolValue("enableBotCheker");
+    mBotcheckerEnabled = config.getBoolValue("enableBotCheker");
 }
 
 BotCheckerWindow::~BotCheckerWindow()
@@ -358,7 +358,7 @@ BotCheckerWindow::~BotCheckerWindow()
 void BotCheckerWindow::slowLogic()
 {
     BLOCK_START("BotCheckerWindow::slowLogic")
-    if (mEnabled && mTableModel)
+    if (mBotcheckerEnabled && mTableModel)
     {
         const unsigned int nowTime = cur_time;
         if (nowTime - mLastUpdateTime > 5 && mNeedUpdate)
@@ -377,7 +377,7 @@ void BotCheckerWindow::slowLogic()
     BLOCK_END("BotCheckerWindow::slowLogic")
 }
 
-void BotCheckerWindow::action(const gcn::ActionEvent &event)
+void BotCheckerWindow::action(const ActionEvent &event)
 {
     if (event.getId() == "reset")
     {
@@ -417,7 +417,7 @@ void BotCheckerWindow::reset()
 void BotCheckerWindow::optionChanged(const std::string &name)
 {
     if (name == "enableBotCheker")
-        mEnabled = config.getBoolValue("enableBotCheker");
+        mBotcheckerEnabled = config.getBoolValue("enableBotCheker");
 }
 
 #ifdef USE_PROFILER
diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h
index d3615957d..0c86b13b0 100644
--- a/src/gui/windows/botcheckerwindow.h
+++ b/src/gui/windows/botcheckerwindow.h
@@ -23,11 +23,11 @@
 #ifndef GUI_BOTCHECKERWINDOW_H
 #define GUI_BOTCHECKERWINDOW_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 struct BOTCHK final
 {
@@ -43,7 +43,7 @@ class UsersTableModel;
 class StaticTableModel;
 
 class BotCheckerWindow final : public Window,
-                               public gcn::ActionListener,
+                               public ActionListener,
                                public ConfigListener
 {
     public:
@@ -61,7 +61,7 @@ class BotCheckerWindow final : public Window,
          */
         ~BotCheckerWindow();
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void update();
 
@@ -86,7 +86,7 @@ class BotCheckerWindow final : public Window,
         Button *mIncButton;
         int mLastUpdateTime;
         bool mNeedUpdate;
-        bool mEnabled;
+        bool mBotcheckerEnabled;
 };
 
 extern BotCheckerWindow *botCheckerWindow;
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index cfefa8159..c2514a15d 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -28,13 +28,15 @@
 
 #include "gui/windows/tradewindow.h"
 
+#include "gui/models/shopitems.h"
+#include "gui/models/sortlistmodelbuy.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
 
@@ -51,41 +53,6 @@
 
 #include "debug.h"
 
-static const char *const SORT_NAME_BUY[7] =
-{
-    // TRANSLATORS: buy dialog sort type.
-    N_("unsorted"),
-    // TRANSLATORS: buy dialog sort type.
-    N_("by price"),
-    // TRANSLATORS: buy dialog sort type.
-    N_("by name"),
-    // TRANSLATORS: buy dialog sort type.
-    N_("by id"),
-    // TRANSLATORS: buy dialog sort type.
-    N_("by weight"),
-    // TRANSLATORS: buy dialog sort type.
-    N_("by amount"),
-    // TRANSLATORS: buy dialog sort type.
-    N_("by type")
-};
-
-class SortListModelBuy final : public gcn::ListModel
-{
-public:
-    ~SortListModelBuy()
-    { }
-
-    int getNumberOfElements()
-    { return 7; }
-
-    std::string getElementAt(int i)
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-        return gettext(SORT_NAME_BUY[i]);
-    }
-};
-
 class SortItemPriceFunctor final
 {
     public:
@@ -193,8 +160,8 @@ BuyDialog::DialogList BuyDialog::instances;
 BuyDialog::BuyDialog() :
     // TRANSLATORS: buy dialog name
     Window(_("Create items"), false, nullptr, "buy.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     mNpcId(-2), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(),
     mSortModel(nullptr),
     mSortDropDown(nullptr)
@@ -205,8 +172,8 @@ BuyDialog::BuyDialog() :
 BuyDialog::BuyDialog(const int npcId) :
     // TRANSLATORS: buy dialog name
     Window(_("Buy"), false, nullptr, "buy.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     mNpcId(npcId), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(),
     mSortModel(nullptr),
     mSortDropDown(nullptr)
@@ -217,8 +184,8 @@ BuyDialog::BuyDialog(const int npcId) :
 BuyDialog::BuyDialog(std::string nick) :
     // TRANSLATORS: buy dialog name
     Window(_("Buy"), false, nullptr, "buy.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     mNpcId(-1), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(nick),
     mSortModel(new SortListModelBuy),
     mSortDropDown(new DropDown(this, mSortModel, false, false, this, "sort"))
@@ -240,14 +207,14 @@ void BuyDialog::init()
 
     mShopItemList = new ShopListBox(this, mShopItems, mShopItems);
     mShopItemList->postInit();
-    mScrollArea = new ScrollArea(mShopItemList,
+    mScrollArea = new ScrollArea(this, mShopItemList,
         getOptionBool("showbackground"), "buy_background.xml");
     mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    mSlider = new Slider(1.0);
+    mSlider = new Slider(this, 1.0);
     mQuantityLabel = new Label(this, strprintf(
         "%d / %d", mAmountItems, mMaxItems));
-    mQuantityLabel->setAlignment(gcn::Graphics::CENTER);
+    mQuantityLabel->setAlignment(Graphics::CENTER);
     // TRANSLATORS: buy dialog label
     mMoneyLabel = new Label(this, strprintf(
         _("Price: %s / Total: %s"), "", ""));
@@ -388,7 +355,7 @@ void BuyDialog::sort()
     }
 }
 
-void BuyDialog::action(const gcn::ActionEvent &event)
+void BuyDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "quit")
@@ -482,7 +449,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void BuyDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
+void BuyDialog::valueChanged(const SelectionEvent &event A_UNUSED)
 {
     // Reset amount of items and update labels
     mAmountItems = 1;
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index e11317cde..aa163d5d0 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/selectionlistener.h"
 
 class Button;
 class DropDown;
@@ -35,7 +35,6 @@ class ShopListBox;
 class SortListModelBuy;
 class IntTextField;
 class Label;
-class ListBox;
 class ScrollArea;
 class Slider;
 
@@ -45,8 +44,8 @@ class Slider;
  * \ingroup Interface
  */
 class BuyDialog final : public Window,
-                        public gcn::ActionListener,
-                        public gcn::SelectionListener
+                        public ActionListener,
+                        public SelectionListener
 {
     public:
         /**
@@ -98,7 +97,7 @@ class BuyDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Returns the number of items in the shop inventory.
@@ -108,7 +107,7 @@ class BuyDialog final : public Window,
         /**
          * Updates the labels according to the selected item.
          */
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
         /**
          * Updates the state of buttons and labels.
diff --git a/src/gui/windows/buyselldialog.cpp b/src/gui/windows/buyselldialog.cpp
index 22f39f449..92f6503bb 100644
--- a/src/gui/windows/buyselldialog.cpp
+++ b/src/gui/windows/buyselldialog.cpp
@@ -37,7 +37,7 @@ BuySellDialog::DialogList BuySellDialog::dialogInstances;
 BuySellDialog::BuySellDialog(const int npcId) :
     // TRANSLATORS: shop window name
     Window(_("Shop"), false, nullptr, "buysell.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mNpcId(npcId),
     mNick(""),
     mBuyButton(nullptr)
@@ -48,7 +48,7 @@ BuySellDialog::BuySellDialog(const int npcId) :
 BuySellDialog::BuySellDialog(const std::string &nick) :
     // TRANSLATORS: shop window name
     Window(_("Shop"), false, nullptr, "buysell.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mNpcId(-1),
     mNick(nick),
     mBuyButton(nullptr)
@@ -119,7 +119,7 @@ void BuySellDialog::setVisible(bool visible)
     }
 }
 
-void BuySellDialog::action(const gcn::ActionEvent &event)
+void BuySellDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "Buy")
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index 34a716ee1..a89ff0bea 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 
@@ -34,7 +34,8 @@ class Button;
  *
  * \ingroup Interface
  */
-class BuySellDialog final : public Window, public gcn::ActionListener
+class BuySellDialog final : public Window,
+                            public ActionListener
 {
     public:
         /**
@@ -58,7 +59,7 @@ class BuySellDialog final : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Returns true if any instances exist.
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index a9f3b3449..b8f9c1fd2 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -45,7 +45,7 @@
 ChangeEmailDialog::ChangeEmailDialog(LoginData *const data):
     // TRANSLATORS: change email dialog header
     Window(_("Change Email Address"), true, nullptr, "changeemail.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mFirstEmailField(new TextField(this)),
     mSecondEmailField(new TextField(this)),
     // TRANSLATORS: button in change email dialog
@@ -109,7 +109,7 @@ ChangeEmailDialog::~ChangeEmailDialog()
     mWrongDataNoticeListener = nullptr;
 }
 
-void ChangeEmailDialog::action(const gcn::ActionEvent &event)
+void ChangeEmailDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "cancel")
diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h
index 31ffa7b39..d2928025d 100644
--- a/src/gui/windows/changeemaildialog.h
+++ b/src/gui/windows/changeemaildialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class LoginData;
@@ -37,7 +37,8 @@ class WrongDataNoticeListener;
  *
  * \ingroup Interface
  */
-class ChangeEmailDialog final : public Window, public gcn::ActionListener
+class ChangeEmailDialog final : public Window,
+                                public ActionListener
 {
     public:
         /**
@@ -57,7 +58,7 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * This is used to pass the pointer to where the new email should be
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index 4646947fa..05c7a9309 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -46,7 +46,7 @@
 ChangePasswordDialog::ChangePasswordDialog(LoginData *const data):
     // TRANSLATORS: change password window name
     Window(_("Change Password"), true, nullptr, "changepassword.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mOldPassField(new PasswordField(this)),
     mFirstPassField(new PasswordField(this)),
     mSecondPassField(new PasswordField(this)),
@@ -88,7 +88,7 @@ ChangePasswordDialog::~ChangePasswordDialog()
     mWrongDataNoticeListener = nullptr;
 }
 
-void ChangePasswordDialog::action(const gcn::ActionEvent &event)
+void ChangePasswordDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "cancel")
diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h
index ce45e6f47..adbaf109a 100644
--- a/src/gui/windows/changepassworddialog.h
+++ b/src/gui/windows/changepassworddialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class LoginData;
@@ -37,7 +37,8 @@ class WrongDataNoticeListener;
  *
  * \ingroup Interface
  */
-class ChangePasswordDialog final : public Window, public gcn::ActionListener
+class ChangePasswordDialog final : public Window,
+                                   public ActionListener
 {
     public:
         /**
@@ -57,7 +58,7 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
     private:
         TextField *mOldPassField;
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index cbce28db7..a877f45e0 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -24,12 +24,14 @@
 
 #include "main.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
+#include "gui/windows/charselectdialog.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/radiobutton.h"
@@ -63,8 +65,8 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
                                    const int slot) :
     // TRANSLATORS: char create dialog name
     Window(_("New Character"), true, parent, "charcreate.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mCharSelectDialog(parent),
     mNameField(new TextField(this, "")),
     // TRANSLATORS: char create dialog label
@@ -123,7 +125,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
     mMaxLook(CharDB::getMaxLook()),
     mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace),
             nullptr)),
-    mPlayerBox(new PlayerBox(mPlayer, "charcreate_playerbox.xml",
+    mPlayerBox(new PlayerBox(this, mPlayer, "charcreate_playerbox.xml",
         "charcreate_selectedplayerbox.xml")),
     mHairStyle(0),
     mHairColor(0),
@@ -206,13 +208,13 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
     const int h = 350;
 
     setContentSize(w, h);
-    mPlayerBox->setDimension(gcn::Rectangle(360, 0, 110, 90));
+    mPlayerBox->setDimension(Rect(360, 0, 110, 90));
     mActionButton->setPosition(385, 100);
     mRotateButton->setPosition(415, 100);
 
     mNameLabel->setPosition(5, 2);
     mNameField->setDimension(
-            gcn::Rectangle(60, 2, 300, mNameField->getHeight()));
+            Rect(60, 2, 300, mNameField->getHeight()));
 
     const int leftX = 120;
     const int rightX = 300;
@@ -318,16 +320,12 @@ CharCreateDialog::~CharCreateDialog()
         Net::getCharServerHandler()->setCharCreateDialog(nullptr);
 }
 
-void CharCreateDialog::action(const gcn::ActionEvent &event)
+void CharCreateDialog::action(const ActionEvent &event)
 {
     const std::string id = event.getId();
     if (id == "create")
     {
-        if (
-#ifdef MANASERV_SUPPORT
-            Net::getNetworkType() == ServerInfo::MANASERV ||
-#endif
-            getName().length() >= 4)
+        if (getName().length() >= 4)
         {
             // Attempt to create the character
             mCreateButton->setEnabled(false);
@@ -339,14 +337,7 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
                     mAttributeSlider[i]->getValue()));
             }
 
-#ifdef MANASERV_SUPPORT
-            int characterSlot = mSlot;
-            // On Manaserv, the slots start at 1, so we offset them.
-            if (Net::getNetworkType() == ServerInfo::MANASERV)
-                ++characterSlot;
-#else
             const int characterSlot = mSlot;
-#endif
 
             Net::getCharServerHandler()->newCharacter(getName(), characterSlot,
                 mFemale->isSelected(), mHairStyle, mHairColor,
@@ -527,8 +518,8 @@ void CharCreateDialog::setAttributes(const StringVect &labels,
         mAttributeLabel[i]->adjustSize();
         add(mAttributeLabel[i]);
 
-        mAttributeSlider[i] = new Slider(min, max);
-        mAttributeSlider[i]->setDimension(gcn::Rectangle(140, y + i * 24,
+        mAttributeSlider[i] = new Slider(this, min, max);
+        mAttributeSlider[i]->setDimension(Rect(140, y + i * 24,
                                                          150, 12));
         mAttributeSlider[i]->setActionEventId("statslider");
         mAttributeSlider[i]->addActionListener(this);
@@ -664,14 +655,14 @@ void CharCreateDialog::updatePlayer()
     }
 }
 
-void CharCreateDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void CharCreateDialog::keyPressed(KeyEvent &keyEvent)
 {
-    const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     switch (actionId)
     {
         case Input::KEY_GUI_CANCEL:
             keyEvent.consume();
-            action(gcn::ActionEvent(mCancelButton,
+            action(ActionEvent(mCancelButton,
                 mCancelButton->getActionEventId()));
             break;
 
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index 0d73bf805..12ddf7970 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -25,11 +25,13 @@
 
 #include "being/being.h"
 
-#include "gui/windows/charselectdialog.h"
+#include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
+class Button;
+class CharSelectDialog;
 class Label;
 class PlayerBox;
 class RadioButton;
@@ -42,8 +44,8 @@ class TextField;
  * \ingroup Interface
  */
 class CharCreateDialog final : public Window,
-                               public gcn::ActionListener,
-                               public gcn::KeyListener
+                               public ActionListener,
+                               public KeyListener
 {
     public:
         /**
@@ -58,7 +60,7 @@ class CharCreateDialog final : public Window,
          */
         ~CharCreateDialog();
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Unlocks the dialog, enabling the create character button again.
@@ -76,7 +78,7 @@ class CharCreateDialog final : public Window,
 
         void updatePlayer();
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
     private:
         int getDistributedPoints() const A_WARN_UNUSED;
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 3f44617f8..4480f06af 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -26,8 +26,9 @@
 #include "configuration.h"
 #include "units.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "gui/windows/charcreatedialog.h"
 #include "gui/windows/confirmdialog.h"
@@ -43,6 +44,7 @@
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
+#include "net/net.h"
 
 #include "utils/gettext.h"
 
@@ -70,7 +72,7 @@ class CharDeleteConfirm final : public ConfirmDialog
 
         A_DELETE_COPY(CharDeleteConfirm)
 
-        void action(const gcn::ActionEvent &event)
+        void action(const ActionEvent &event)
         {
             if (event.getId() == "yes" && mMaster)
                 mMaster->askPasswordForDeletion(mIndex);
@@ -88,8 +90,8 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
     Window(strprintf(_("Account %s (last login time %s)"),
         data->username.c_str(), data->lastLogin.c_str()),
         false, nullptr, "char.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mLoginData(data),
     // TRANSLATORS: char select dialog. button.
     mSwitchLoginButton(new Button(this, _("Switch Login"), "switch", this)),
@@ -205,10 +207,10 @@ void CharSelectDialog::postInit()
     requestFocus();
 }
 
-void CharSelectDialog::action(const gcn::ActionEvent &event)
+void CharSelectDialog::action(const ActionEvent &event)
 {
     // Check if a button of a character was pressed
-    const gcn::Widget *const sourceParent = event.getSource()->getParent();
+    const Widget *const sourceParent = event.getSource()->getParent();
     int selected = -1;
     for (unsigned int i = 0, sz = static_cast<unsigned int>(
          mCharacterEntries.size()); i < sz; ++i)
@@ -315,14 +317,14 @@ void CharSelectDialog::use(const int selected)
     }
 }
 
-void CharSelectDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void CharSelectDialog::keyPressed(KeyEvent &keyEvent)
 {
-    const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     switch (actionId)
     {
         case Input::KEY_GUI_CANCEL:
             keyEvent.consume();
-            action(gcn::ActionEvent(mSwitchLoginButton,
+            action(ActionEvent(mSwitchLoginButton,
                 mSwitchLoginButton->getActionEventId()));
             break;
 
@@ -471,15 +473,7 @@ void CharSelectDialog::setCharacters(const Net::Characters &characters)
 
         Net::Character *const character = *i;
 
-        // Slots Number start at 1 for Manaserv, so we offset them by one.
-#ifdef MANASERV_SUPPORT
-        int characterSlot = character->slot;
-        if (Net::getNetworkType() == ServerInfo::MANASERV && characterSlot > 0)
-            --characterSlot;
-#else
         const int characterSlot = character->slot;
-#endif
-
         if (characterSlot >= static_cast<int>(mCharacterEntries.size()))
         {
             logger->log("Warning: slot out of range: %d", character->slot);
@@ -563,7 +557,7 @@ void CharSelectDialog::close()
     Window::close();
 }
 
-void CharSelectDialog::widgetResized(const gcn::Event &event)
+void CharSelectDialog::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
     if (mCharacterView)
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 3ac5d664f..38c307f30 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -29,13 +29,12 @@
 
 #include "net/charserverhandler.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 class Button;
 class CharacterDisplay;
 class CharacterViewBase;
-class Label;
 class LoginData;
 class TextDialog;
 
@@ -45,8 +44,8 @@ class TextDialog;
  * \ingroup Interface
  */
 class CharSelectDialog final : public Window,
-                               public gcn::ActionListener,
-                               public gcn::KeyListener
+                               public ActionListener,
+                               public KeyListener
 {
     public:
         friend class CharDeleteConfirm;
@@ -61,9 +60,9 @@ class CharSelectDialog final : public Window,
 
         ~CharSelectDialog();
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
         enum SelectAction
         {
@@ -86,7 +85,7 @@ class CharSelectDialog final : public Window,
 
         void close() override final;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void updateState();
 
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 26f665052..d769c4397 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -35,13 +35,16 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
+#include "events/keyevent.h"
+
 #include "input/inputmanager.h"
-#include "input/keyevent.h"
 
-#include "gui/sdlfont.h"
-#include "gui/sdlinput.h"
+#include "gui/focushandler.h"
+#include "gui/gui.h"
 #include "gui/viewport.h"
 
+#include "gui/models/colorlistmodel.h"
+
 #include "gui/windows/emotewindow.h"
 #include "gui/windows/setupwindow.h"
 #include "gui/widgets/tabbedarea.h"
@@ -68,8 +71,6 @@
 
 #include "resources/resourcemanager.h"
 
-#include <guichan/focushandler.hpp>
-
 #include <sstream>
 
 #include <sys/stat.h>
@@ -97,7 +98,7 @@ class ChatInput final : public TextField
          * Called if the chat input loses focus. It will set itself to
          * invisible as result.
          */
-        void focusLost(const gcn::Event &event)
+        void focusLost(const Event &event)
         {
             TextField::focusLost(event);
             if (mFocusGaining || !config.getBoolValue("protectChatFocus"))
@@ -145,65 +146,13 @@ class ChatInput final : public TextField
         bool mFocusGaining;
 };
 
-const char *COLOR_NAME[14] =
-{
-    // TRANSLATORS: chat color
-    N_("default"),
-    // TRANSLATORS: chat color
-    N_("black"),
-    // TRANSLATORS: chat color
-    N_("red"),
-    // TRANSLATORS: chat color
-    N_("green"),
-    // TRANSLATORS: chat color
-    N_("blue"),
-    // TRANSLATORS: chat color
-    N_("gold"),
-    // TRANSLATORS: chat color
-    N_("yellow"),
-    // TRANSLATORS: chat color
-    N_("pink"),
-    // TRANSLATORS: chat color
-    N_("purple"),
-    // TRANSLATORS: chat color
-    N_("grey"),
-    // TRANSLATORS: chat color
-    N_("brown"),
-    // TRANSLATORS: chat color
-    N_("rainbow 1"),
-    // TRANSLATORS: chat color
-    N_("rainbow 2"),
-    // TRANSLATORS: chat color
-    N_("rainbow 3"),
-};
-
-
-class ColorListModel final : public gcn::ListModel
-{
-public:
-    ~ColorListModel()
-    { }
-
-    int getNumberOfElements()
-    {
-        return 14;
-    }
-
-    std::string getElementAt(int i)
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-        return gettext(COLOR_NAME[i]);
-    }
-};
-
 static const char *const ACTION_COLOR_PICKER = "color picker";
 
 ChatWindow::ChatWindow():
     // TRANSLATORS: chat window name
     Window(_("Chat"), false, nullptr, "chat.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mItemLinkHandler(new ItemLinkHandler),
     mChatTabs(new TabbedArea(this)),
     mChatInput(new ChatInput(this)),
@@ -378,7 +327,7 @@ void ChatWindow::updateTabsMargin()
 
 void ChatWindow::adjustTabSize()
 {
-    const gcn::Rectangle area = getChildrenArea();
+    const Rect area = getChildrenArea();
 
     const int aw = area.width;
     const int ah = area.height;
@@ -425,7 +374,7 @@ void ChatWindow::adjustTabSize()
     const ChatTab *const tab = getFocused();
     if (tab)
     {
-        gcn::Widget *const content = tab->mScrollArea;
+        Widget *const content = tab->mScrollArea;
         if (content)
         {
             const int contentFrame2 = 2 * content->getFrameSize();
@@ -441,7 +390,7 @@ void ChatWindow::adjustTabSize()
     mChatTabs->adjustSize();
 }
 
-void ChatWindow::widgetResized(const gcn::Event &event)
+void ChatWindow::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
 
@@ -514,7 +463,7 @@ void ChatWindow::defaultTab()
         mChatTabs->setSelectedTabByIndex(static_cast<unsigned>(0));
 }
 
-void ChatWindow::action(const gcn::ActionEvent &event)
+void ChatWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "chatinput")
@@ -770,12 +719,12 @@ void ChatWindow::scroll(const int amount) const
         tab->scroll(amount);
 }
 
-void ChatWindow::mousePressed(gcn::MouseEvent &event)
+void ChatWindow::mousePressed(MouseEvent &event)
 {
     if (event.isConsumed())
         return;
 
-    if (event.getButton() == gcn::MouseEvent::RIGHT)
+    if (event.getButton() == MouseEvent::RIGHT)
     {
         if (viewport)
         {
@@ -804,7 +753,7 @@ void ChatWindow::mousePressed(gcn::MouseEvent &event)
     if (event.isConsumed())
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         const ChatTab *const tab = getFocused();
         if (tab)
@@ -815,7 +764,7 @@ void ChatWindow::mousePressed(gcn::MouseEvent &event)
     mDragOffsetY = event.getY();
 }
 
-void ChatWindow::mouseDragged(gcn::MouseEvent &event)
+void ChatWindow::mouseDragged(MouseEvent &event)
 {
     Window::mouseDragged(event);
 
@@ -836,10 +785,10 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event)
     temp = str; \
     break
 
-void ChatWindow::keyPressed(gcn::KeyEvent &event)
+void ChatWindow::keyPressed(KeyEvent &event)
 {
     const int key = event.getKey().getValue();
-    const int actionId = static_cast<KeyEvent*>(&event)->getActionId();
+    const int actionId = event.getActionId();
     if (actionId == static_cast<int>(Input::KEY_GUI_DOWN))
     {
         if (mCurHist != mHistory.end())
@@ -1884,25 +1833,25 @@ void ChatWindow::optionChanged(const std::string &name)
         parseGlobalsFilter();
 }
 
-void ChatWindow::mouseMoved(gcn::MouseEvent &event)
+void ChatWindow::mouseMoved(MouseEvent &event)
 {
     mHaveMouse = true;
     Window::mouseMoved(event);
 }
 
-void ChatWindow::mouseEntered(gcn::MouseEvent& mouseEvent)
+void ChatWindow::mouseEntered(MouseEvent& mouseEvent)
 {
     mHaveMouse = true;
     Window::mouseEntered(mouseEvent);
 }
 
-void ChatWindow::mouseExited(gcn::MouseEvent& mouseEvent)
+void ChatWindow::mouseExited(MouseEvent& mouseEvent)
 {
     updateVisibility();
     Window::mouseExited(mouseEvent);
 }
 
-void ChatWindow::draw(gcn::Graphics* graphics)
+void ChatWindow::draw(Graphics* graphics)
 {
     BLOCK_START("ChatWindow::draw")
     if (!mAutoHide || mHaveMouse)
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 3093c52e9..2ec4e6bec 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -23,14 +23,14 @@
 #ifndef GUI_WINDOWS_CHATWINDOW_H
 #define GUI_WINDOWS_CHATWINDOW_H
 
-#include "depricatedlistener.h"
+#include "listeners/depricatedlistener.h"
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 #include <list>
 #include <map>
@@ -83,8 +83,8 @@ struct CHATLOG final
  * \ingroup Interface
  */
 class ChatWindow final : public Window,
-                         public gcn::ActionListener,
-                         public gcn::KeyListener,
+                         public ActionListener,
+                         public KeyListener,
                          public DepricatedListener,
                          public ConfigListener
 {
@@ -139,7 +139,7 @@ class ChatWindow final : public Window,
         /**
          * Performs action.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Request focus for typing chat message.
@@ -169,7 +169,7 @@ class ChatWindow final : public Window,
         void localChatInput(const std::string &msg) const;
 
         /** Called when key is pressed */
-        void keyPressed(gcn::KeyEvent &event) override final;
+        void keyPressed(KeyEvent &event) override final;
 
         /** Set the chat input as the given text. */
         void setInputText(const std::string &text);
@@ -186,12 +186,12 @@ class ChatWindow final : public Window,
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
         void processEvent(const Channels channel,
                           const DepricatedEvent &event) override final;
@@ -274,19 +274,19 @@ class ChatWindow final : public Window,
 
         void optionChanged(const std::string &name) override final;
 
-        void mouseEntered(gcn::MouseEvent& mouseEvent) override final;
+        void mouseEntered(MouseEvent& mouseEvent) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override final;
+        void mouseExited(MouseEvent& mouseEvent A_UNUSED) override final;
 
-        void draw(gcn::Graphics* graphics) override final;
+        void draw(Graphics* graphics) override final;
 
         void updateVisibility();
 
         void unHideWindow();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void addGlobalMessage(const std::string &line);
 
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index e48427a5b..6eb21622d 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -29,7 +29,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
@@ -39,7 +39,7 @@ ConfirmDialog::ConfirmDialog(const std::string &restrict title,
                              const bool ignore,
                              const bool modal, Window *const parent):
     Window(title, modal, parent, "confirm.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mTextBox(new TextBox(this)),
     mIgnore(ignore)
 {
@@ -107,7 +107,7 @@ void ConfirmDialog::postInit()
     yesButton->requestFocus();
 }
 
-void ConfirmDialog::action(const gcn::ActionEvent &event)
+void ConfirmDialog::action(const ActionEvent &event)
 {
     setActionEventId(event.getId());
     distributeActionEvent();
diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 0b092e234..0d9f25d38 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -29,7 +29,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class TextBox;
 
@@ -38,7 +38,8 @@ class TextBox;
  *
  * \ingroup GUI
  */
-class ConfirmDialog : public Window, public gcn::ActionListener
+class ConfirmDialog : public Window,
+                      public ActionListener
 {
     public:
         /**
@@ -57,7 +58,7 @@ class ConfirmDialog : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override;
+        void action(const ActionEvent &event) override;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp
index 6d01dcaae..1a7c23187 100644
--- a/src/gui/windows/connectiondialog.cpp
+++ b/src/gui/windows/connectiondialog.cpp
@@ -34,14 +34,14 @@
 ConnectionDialog::ConnectionDialog(const std::string &text,
                                    const State cancelState):
     Window("", false, nullptr, "connection.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mCancelState(cancelState)
 {
     setTitleBarHeight(0);
     setMovable(false);
     setMinWidth(0);
 
-    ProgressIndicator *const progressIndicator = new ProgressIndicator;
+    ProgressIndicator *const progressIndicator = new ProgressIndicator(this);
     Label *const label = new Label(this, text);
     Button *const cancelButton = new Button(
         // TRANSLATORS: connection dialog button
@@ -60,13 +60,13 @@ void ConnectionDialog::postInit()
     setVisible(true);
 }
 
-void ConnectionDialog::action(const gcn::ActionEvent &)
+void ConnectionDialog::action(const ActionEvent &)
 {
     logger->log1("Cancel pressed");
     client->setState(mCancelState);
 }
 
-void ConnectionDialog::draw(gcn::Graphics *graphics)
+void ConnectionDialog::draw(Graphics *graphics)
 {
     BLOCK_START("ConnectionDialog::draw")
     // Don't draw the window background, only draw the children
diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h
index 2f861bc52..059d4bd6d 100644
--- a/src/gui/windows/connectiondialog.h
+++ b/src/gui/windows/connectiondialog.h
@@ -27,14 +27,15 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 /**
  * The connection dialog.
  *
  * \ingroup Interface
  */
-class ConnectionDialog final : public Window, private gcn::ActionListener
+class ConnectionDialog final : public Window,
+                               private ActionListener
 {
     public:
         /**
@@ -55,9 +56,9 @@ class ConnectionDialog final : public Window, private gcn::ActionListener
          * Called when the user presses Cancel. Restores the global state to
          * the previous one.
          */
-        void action(const gcn::ActionEvent &) override;
+        void action(const ActionEvent &) override;
 
-        void draw(gcn::Graphics *graphics) override;
+        void draw(Graphics *graphics) override;
 
     private:
         State mCancelState;
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 30d202054..50dc5dbe5 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -75,7 +75,7 @@ DebugWindow::DebugWindow() :
     // TRANSLATORS: debug window tab
     mTabs->addTab(std::string(_("Net")), mNetWidget);
 
-    mTabs->setDimension(gcn::Rectangle(0, 0, 600, 300));
+    mTabs->setDimension(Rect(0, 0, 600, 300));
 
     const int w = mDimension.width;
     const int h = mDimension.height;
@@ -129,7 +129,7 @@ void DebugWindow::slowLogic()
     BLOCK_END("DebugWindow::slowLogic")
 }
 
-void DebugWindow::draw(gcn::Graphics *g)
+void DebugWindow::draw(Graphics *g)
 {
     BLOCK_START("DebugWindow::draw")
     Window::draw(g);
@@ -139,8 +139,7 @@ void DebugWindow::draw(gcn::Graphics *g)
         const Being *const target = player_node->getTarget();
         if (target)
         {
-            Graphics *const g2 = static_cast<Graphics*>(g);
-            target->draw(g2, -target->getPixelX() + mapTileSize / 2
+            target->draw(g, -target->getPixelX() + mapTileSize / 2
                 + mDimension.width / 2, -target->getPixelY() + mapTileSize
                 + mDimension.height / 2);
         }
@@ -148,11 +147,11 @@ void DebugWindow::draw(gcn::Graphics *g)
     BLOCK_END("DebugWindow::draw")
 }
 
-void DebugWindow::widgetResized(const gcn::Event &event)
+void DebugWindow::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
 
-    mTabs->setDimension(gcn::Rectangle(0, 0,
+    mTabs->setDimension(Rect(0, 0,
         mDimension.width, mDimension.height));
 }
 
@@ -268,7 +267,7 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) :
 #endif
     place.getCell().matchColWidth(0, 0);
     place = h.getPlacer(0, 1);
-    setDimension(gcn::Rectangle(0, 0, 600, 300));
+    setDimension(Rect(0, 0, 600, 300));
 }
 
 void MapDebugTab::logic()
@@ -413,7 +412,7 @@ TargetDebugTab::TargetDebugTab(const Widget2 *const widget) :
 
     place.getCell().matchColWidth(0, 0);
     place = h.getPlacer(0, 1);
-    setDimension(gcn::Rectangle(0, 0, 600, 300));
+    setDimension(Rect(0, 0, 600, 300));
 }
 
 void TargetDebugTab::logic()
@@ -532,7 +531,7 @@ NetDebugTab::NetDebugTab(const Widget2 *const widget) :
 
     place.getCell().matchColWidth(0, 0);
     place = h.getPlacer(0, 1);
-    setDimension(gcn::Rectangle(0, 0, 600, 300));
+    setDimension(Rect(0, 0, 600, 300));
 }
 
 void NetDebugTab::logic()
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index 13e73c29e..1a56f3164 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -41,7 +41,7 @@ class DebugTab : public Container
         }
 
         void resize(const int x, const int y)
-        { setDimension(gcn::Rectangle(0, 0, x, y)); }
+        { setDimension(Rect(0, 0, x, y)); }
 
     protected:
         explicit DebugTab(const Widget2 *const widget) :
@@ -147,11 +147,11 @@ class DebugWindow final : public Window
          */
         void slowLogic();
 
-        void draw(gcn::Graphics *g) override final;
+        void draw(Graphics *g) override final;
 
         void setPing(int pingTime);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
 #ifdef USE_PROFILER
         void logicChildren();
diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp
index 93166e6fa..79ad4c208 100644
--- a/src/gui/windows/didyouknowwindow.cpp
+++ b/src/gui/windows/didyouknowwindow.cpp
@@ -24,7 +24,7 @@
 
 #include "configuration.h"
 
-#include "gui/sdlfont.h"
+#include "gui/gui.h"
 
 #include "gui/windows/setupwindow.h"
 
@@ -48,10 +48,10 @@ static const int maxTip = 18;
 DidYouKnowWindow::DidYouKnowWindow() :
     // TRANSLATORS: did you know window name
     Window(_("Did You Know?"), false, nullptr, "didyouknow.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
         "browserbox.xml")),
-    mScrollArea(new ScrollArea(mBrowserBox,
+    mScrollArea(new ScrollArea(this, mBrowserBox,
         true, "didyouknow_background.xml")),
     // TRANSLATORS: did you know window button
     mButtonPrev(new Button(this, _("< Previous"), "prev", this)),
@@ -78,7 +78,8 @@ DidYouKnowWindow::DidYouKnowWindow() :
     Button *const okButton = new Button(this, _("Close"), "close", this);
 
     mBrowserBox->setLinkHandler(this);
-    mBrowserBox->setFont(gui->getHelpFont());
+    if (gui)
+        mBrowserBox->setFont(gui->getHelpFont());
     mBrowserBox->setProcessVersion(true);
     mBrowserBox->setEnableImages(true);
     mBrowserBox->setEnableKeys(true);
@@ -99,10 +100,10 @@ DidYouKnowWindow::DidYouKnowWindow() :
 
 void DidYouKnowWindow::postInit()
 {
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
 
-void DidYouKnowWindow::action(const gcn::ActionEvent &event)
+void DidYouKnowWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "close")
@@ -129,7 +130,7 @@ void DidYouKnowWindow::action(const gcn::ActionEvent &event)
 }
 
 void DidYouKnowWindow::handleLink(const std::string &link,
-                                  gcn::MouseEvent *event A_UNUSED)
+                                  MouseEvent *event A_UNUSED)
 {
     if (strStartWith(link, "http://") || strStartWith(link, "https://"))
         openBrowser(link);
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 942bcf41c..fd539e360 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -26,7 +26,7 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class BrowserBox;
@@ -38,7 +38,7 @@ class ScrollArea;
  */
 class DidYouKnowWindow final : public Window,
                                public LinkHandler,
-                               public gcn::ActionListener
+                               public ActionListener
 {
     public:
         /**
@@ -53,13 +53,13 @@ class DidYouKnowWindow final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Handles link action.
          */
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event) override final;
+                        MouseEvent *event) override final;
 
         void loadData(int num = 0);
 
diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp
index 5c002212f..55102acdb 100644
--- a/src/gui/windows/editdialog.cpp
+++ b/src/gui/windows/editdialog.cpp
@@ -33,7 +33,7 @@ EditDialog::EditDialog(const std::string &restrict title,
                        const std::string &restrict eventOk, const int width,
                        Window *const parent, const bool modal):
     Window(title, modal, parent, "edit.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mEventOk(eventOk),
     mTextField(new TextField(this))
 {
@@ -65,7 +65,7 @@ void EditDialog::postInit()
     okButton->requestFocus();
 }
 
-void EditDialog::action(const gcn::ActionEvent &event)
+void EditDialog::action(const ActionEvent &event)
 {
     // Proxy button events to our listeners
     FOR_EACH (ActionListenerIterator, i, mActionListeners)
diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h
index fa4a02bf7..b3bfe1f45 100644
--- a/src/gui/windows/editdialog.h
+++ b/src/gui/windows/editdialog.h
@@ -28,7 +28,7 @@
 #include "gui/widgets/window.h"
 #include "gui/widgets/textfield.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #define ACTION_EDIT_OK "edit ok"
 
@@ -37,7 +37,8 @@
  *
  * \ingroup GUI
  */
-class EditDialog final : public Window, public gcn::ActionListener
+class EditDialog final : public Window,
+                         public ActionListener
 {
     public:
         /**
@@ -58,7 +59,7 @@ class EditDialog final : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         std::string getMsg() const A_WARN_UNUSED
         { return mTextField->getText(); }
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 900fe840b..316a7051b 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -21,8 +21,11 @@
 
 #include "gui/windows/editserverdialog.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
+
+#include "gui/models/typelistmodel.h"
 
 #include "gui/windows/okdialog.h"
 #include "gui/windows/serverdialog.h"
@@ -35,36 +38,13 @@
 
 #include "utils/gettext.h"
 
-std::string TypeListModel::getElementAt(int elementIndex)
-{
-    if (elementIndex == 0)
-        return "TmwAthena";
-    else if (elementIndex == 1)
-        return "Evol";
-#ifdef EATHENA_SUPPORT
-    else if (elementIndex == 2)
-        return "eAthena";
-#ifdef MANASERV_SUPPORT
-    else if (elementIndex == 3)
-        return "ManaServ";
-#endif
-#else
-#ifdef MANASERV_SUPPORT
-    else if (elementIndex == 2)
-        return "ManaServ";
-#endif
-#endif
-    else
-        return "Unknown";
-}
-
 EditServerDialog::EditServerDialog(ServerDialog *const parent,
                                    ServerInfo server,
                                    const int index) :
     // TRANSLATORS: edit server dialog name
     Window(_("Edit Server"), true, parent),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mServerAddressField(new TextField(this, std::string())),
     mPortField(new TextField(this, std::string())),
     mNameField(new TextField(this, std::string())),
@@ -159,17 +139,6 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
         case ServerInfo::EATHENA:
             mTypeField->setSelected(2);
             break;
-        case ServerInfo::MANASERV:
-#ifdef MANASERV_SUPPORT
-            mTypeField->setSelected(3);
-            break;
-#endif
-#else
-        case ServerInfo::MANASERV:
-#ifdef MANASERV_SUPPORT
-            mTypeField->setSelected(2);
-            break;
-#endif
 #endif
         default:
         case ServerInfo::UNKNOWN:
@@ -198,7 +167,7 @@ void EditServerDialog::postInit()
     mNameField->requestFocus();
 }
 
-void EditServerDialog::action(const gcn::ActionEvent &event)
+void EditServerDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
 
@@ -246,17 +215,6 @@ void EditServerDialog::action(const gcn::ActionEvent &event)
                     case 2:
                         mServer.type = ServerInfo::EATHENA;
                         break;
-#ifdef MANASERV_SUPPORT
-                    case 3:
-                        mServer.type = ServerInfo::MANASERV;
-                        break;
-#endif
-#else
-#ifdef MANASERV_SUPPORT
-                    case 2:
-                        mServer.type = ServerInfo::MANASERV;
-                        break;
-#endif
 #endif
                     default:
                         mServer.type = ServerInfo::UNKNOWN;
@@ -284,13 +242,12 @@ void EditServerDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void EditServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void EditServerDialog::keyPressed(KeyEvent &keyEvent)
 {
     if (keyEvent.isConsumed())
         return;
 
-    const int actionId = static_cast<KeyEvent*>(
-        &keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
 
     if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
     {
@@ -299,6 +256,6 @@ void EditServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
     else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
              || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
     {
-        action(gcn::ActionEvent(nullptr, mOkButton->getActionEventId()));
+        action(ActionEvent(nullptr, mOkButton->getActionEventId()));
     }
 }
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index 525005429..b70d1031b 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -26,48 +26,14 @@ class Button;
 class TextField;
 class DropDown;
 class ServerDialog;
+class TypeListModel;
 
 #include "gui/widgets/window.h"
 
 #include "net/serverinfo.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
-
-/**
- * Server Type List Model
- */
-class TypeListModel : public gcn::ListModel
-{
-    public:
-        TypeListModel()
-        { }
-
-        /**
-         * Used to get number of line in the list
-         */
-        int getNumberOfElements() override final A_WARN_UNUSED
-#ifdef EATHENA_SUPPORT
-#ifdef MANASERV_SUPPORT
-        { return 4; }
-#else
-        { return 3; }
-#endif
-#else
-#ifdef MANASERV_SUPPORT
-        { return 3; }
-#else
-        { return 2; }
-#endif
-#endif
-
-        /**
-         * Used to get an element from the list
-         */
-        std::string getElementAt(int elementIndex)
-                                 override final A_WARN_UNUSED;
-};
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 /**
  * The custom server addition dialog.
@@ -75,8 +41,8 @@ class TypeListModel : public gcn::ListModel
  * \ingroup Interface
  */
 class EditServerDialog final : public Window,
-                               public gcn::ActionListener,
-                               public gcn::KeyListener
+                               public ActionListener,
+                               public KeyListener
 {
     public:
         EditServerDialog(ServerDialog *const parent, ServerInfo server,
@@ -91,9 +57,9 @@ class EditServerDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
     private:
         TextField *mServerAddressField;
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 9dd5f648c..3a7141533 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -20,10 +20,11 @@
 
 #include "gui/windows/emotewindow.h"
 
-#include "gui/widgets/colormodel.h"
+#include "gui/models/colormodel.h"
+#include "gui/models/namesmodel.h"
+
 #include "gui/widgets/colorpage.h"
 #include "gui/widgets/emotepage.h"
-#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 
@@ -51,10 +52,10 @@ EmoteWindow::EmoteWindow() :
     mEmotePage(new EmotePage(this)),
     mColorModel(ColorModel::createDefault(this)),
     mColorPage(new ColorPage(this, mColorModel, "colorpage.xml")),
-    mScrollColorPage(new ScrollArea(mColorPage, false, "emotepage.xml")),
+    mScrollColorPage(new ScrollArea(this, mColorPage, false, "emotepage.xml")),
     mFontModel(new NamesModel),
     mFontPage(new ListBox(this, mFontModel, "")),
-    mScrollFontPage(new ScrollArea(mFontPage, false, "fontpage.xml")),
+    mScrollFontPage(new ScrollArea(this, mFontPage, false, "fontpage.xml")),
     mImageSet(Theme::getImageSetFromThemeXml("emotetabs.xml", "", 17, 16))
 {
     mTabs->postInit();
@@ -207,14 +208,14 @@ void EmoteWindow::clearFont()
     setVisible(false);
 }
 
-void EmoteWindow::addListeners(gcn::ActionListener *const listener)
+void EmoteWindow::addListeners(ActionListener *const listener)
 {
     mEmotePage->addActionListener(listener);
     mColorPage->addActionListener(listener);
     mFontPage->addActionListener(listener);
 }
 
-void EmoteWindow::widgetResized(const gcn::Event &event)
+void EmoteWindow::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
     const int pad2 = mPadding * 2;
@@ -229,7 +230,7 @@ void EmoteWindow::widgetResized(const gcn::Event &event)
     mEmotePage->widgetResized(event);
 }
 
-void EmoteWindow::widgetMoved(const gcn::Event &event)
+void EmoteWindow::widgetMoved(const Event &event)
 {
     Window::widgetMoved(event);
     mEmotePage->widgetResized(event);
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index 0f15b7bc6..37a5c015f 100644
--- a/src/gui/windows/emotewindow.h
+++ b/src/gui/windows/emotewindow.h
@@ -59,11 +59,11 @@ class EmoteWindow final : public Window
 
         void clearFont();
 
-        void addListeners(gcn::ActionListener *const listener);
+        void addListeners(ActionListener *const listener);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
     private:
         TabbedArea *mTabs;
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 3b97e12d7..c793ba6ce 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -32,6 +32,7 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "gui/font.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/itempopup.h"
@@ -46,8 +47,6 @@
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 static const int BOX_COUNT = 13;
@@ -57,10 +56,11 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
                                  const bool foring):
     // TRANSLATORS: equipment window name
     Window(_("Equipment"), false, nullptr, "equipment.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mEquipment(equipment),
     mItemPopup(new ItemPopup),
-    mPlayerBox(new PlayerBox("equipment_playerbox.xml",
+    mPlayerBox(new PlayerBox(this,
+        "equipment_playerbox.xml",
         "equipment_selectedplayerbox.xml")),
     // TRANSLATORS: equipment window button
     mUnequip(new Button(this, _("Unequip"), "unequip", this)),
@@ -92,7 +92,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
         mBoxSize = 36;
 
     // Control that shows the Player
-    mPlayerBox->setDimension(gcn::Rectangle(50, 80, 74, 168));
+    mPlayerBox->setDimension(Rect(50, 80, 74, 168));
     mPlayerBox->setPlayer(being);
 
     if (foring)
@@ -116,7 +116,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
 
 void EquipmentWindow::postInit()
 {
-    const gcn::Rectangle &area = getChildrenArea();
+    const Rect &area = getChildrenArea();
     mUnequip->setPosition(area.width  - mUnequip->getWidth() - mButtonPadding,
         area.height - mUnequip->getHeight() - mButtonPadding);
     mUnequip->setEnabled(false);
@@ -156,15 +156,14 @@ EquipmentWindow::~EquipmentWindow()
     mVertexes = nullptr;
 }
 
-void EquipmentWindow::draw(gcn::Graphics *graphics)
+void EquipmentWindow::draw(Graphics *graphics)
 {
     BLOCK_START("EquipmentWindow::draw")
     // Draw window graphics
     Window::draw(graphics);
-    Graphics *const g = static_cast<Graphics*>(graphics);
 
     int i = 0;
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     const int fontHeight = font->getHeight();
 
     if (isBatchDrawRenders(openGLMode))
@@ -179,17 +178,19 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
                     continue;
                 if (i == mSelected)
                 {
-                    g->calcTileCollection(mVertexes,
-                        mSlotHighlightedBackground, box->x, box->y);
+                    graphics->calcTileCollection(mVertexes,
+                        mSlotHighlightedBackground,
+                        box->x, box->y);
                 }
                 else
                 {
-                    g->calcTileCollection(mVertexes, mSlotBackground,
+                    graphics->calcTileCollection(mVertexes,
+                        mSlotBackground,
                         box->x, box->y);
                 }
             }
         }
-        g->drawTileCollection(mVertexes);
+        graphics->drawTileCollection(mVertexes);
     }
     else
     {
@@ -200,9 +201,14 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             if (!box)
                 continue;
             if (i == mSelected)
-                g->drawImage2(mSlotHighlightedBackground, box->x, box->y);
+            {
+                graphics->drawImage(mSlotHighlightedBackground,
+                    box->x, box->y);
+            }
             else
-                g->drawImage2(mSlotBackground, box->x, box->y);
+            {
+                graphics->drawImage(mSlotBackground, box->x, box->y);
+            }
         }
     }
 
@@ -228,13 +234,14 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             {
                 image->setAlpha(1.0F);  // Ensure the image is drawn
                                         // with maximum opacity
-                g->drawImage2(image, box->x + mItemPadding,
+                graphics->drawImage(image, box->x + mItemPadding,
                     box->y + mItemPadding);
                 if (i == EQUIP_PROJECTILE_SLOT)
                 {
-                    g->setColorAll(mLabelsColor, mLabelsColor2);
+                    graphics->setColorAll(mLabelsColor, mLabelsColor2);
                     const std::string str = toString(item->getQuantity());
-                    font->drawString(g, str,
+                    font->drawString(graphics,
+                        str,
                         box->x + (mBoxSize - font->getWidth(str)) / 2,
                         box->y - fontHeight);
                 }
@@ -242,14 +249,15 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         }
         else if (box->image)
         {
-            g->drawImage2(box->image, box->x + mItemPadding,
+            graphics->drawImage(box->image,
+                box->x + mItemPadding,
                 box->y + mItemPadding);
         }
     }
     BLOCK_END("EquipmentWindow::draw")
 }
 
-void EquipmentWindow::action(const gcn::ActionEvent &event)
+void EquipmentWindow::action(const ActionEvent &event)
 {
     if (!mEquipment)
         return;
@@ -275,7 +283,7 @@ Item *EquipmentWindow::getItem(const int x, const int y) const
         const EquipmentBox *const box = *it;
         if (!box)
             continue;
-        const gcn::Rectangle tRect(box->x, box->y, mBoxSize, mBoxSize);
+        const Rect tRect(box->x, box->y, mBoxSize, mBoxSize);
 
         if (tRect.isPointInRect(x, y))
             return mEquipment->getEquipment(i);
@@ -283,7 +291,7 @@ Item *EquipmentWindow::getItem(const int x, const int y) const
     return nullptr;
 }
 
-void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
+void EquipmentWindow::mousePressed(MouseEvent& mouseEvent)
 {
     if (!mEquipment)
     {
@@ -294,7 +302,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
     const int x = mouseEvent.getX();
     const int y = mouseEvent.getY();
 
-    if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
     {
         if (mForing)
         {
@@ -313,7 +321,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
             if (!box)
                 continue;
             const Item *const item = mEquipment->getEquipment(i);
-            const gcn::Rectangle tRect(box->x, box->y, mBoxSize, mBoxSize);
+            const Rect tRect(box->x, box->y, mBoxSize, mBoxSize);
 
             if (tRect.isPointInRect(x, y))
             {
@@ -329,7 +337,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
                 return;
         }
     }
-    else if (mouseEvent.getButton() == gcn::MouseEvent::RIGHT)
+    else if (mouseEvent.getButton() == MouseEvent::RIGHT)
     {
         if (Item *const item = getItem(x, y))
         {
@@ -354,7 +362,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
     Window::mousePressed(mouseEvent);
 }
 
-void EquipmentWindow::mouseReleased(gcn::MouseEvent &mouseEvent)
+void EquipmentWindow::mouseReleased(MouseEvent &mouseEvent)
 {
     Window::mouseReleased(mouseEvent);
     const DragDropSource src = dragDrop.getSource();
@@ -394,7 +402,7 @@ void EquipmentWindow::mouseReleased(gcn::MouseEvent &mouseEvent)
                 const EquipmentBox *const box = *it;
                 if (!box)
                     continue;
-                const gcn::Rectangle tRect(box->x, box->y, mBoxSize, mBoxSize);
+                const Rect tRect(box->x, box->y, mBoxSize, mBoxSize);
 
                 if (tRect.isPointInRect(x, y))
                     return;
@@ -409,7 +417,7 @@ void EquipmentWindow::mouseReleased(gcn::MouseEvent &mouseEvent)
 }
 
 // Show ItemTooltip
-void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
+void EquipmentWindow::mouseMoved(MouseEvent &event)
 {
     Window::mouseMoved(event);
 
@@ -433,7 +441,7 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void EquipmentWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void EquipmentWindow::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
@@ -506,7 +514,7 @@ void EquipmentWindow::fillBoxes()
 
 void EquipmentWindow::loadPlayerBox(const XmlNodePtr playerBoxNode)
 {
-    mPlayerBox->setDimension(gcn::Rectangle(
+    mPlayerBox->setDimension(Rect(
         XML::getProperty(playerBoxNode, "x", 50),
         XML::getProperty(playerBoxNode, "y", 80),
         XML::getProperty(playerBoxNode, "width", 74),
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index 7387fb249..0ab4ca462 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -30,7 +30,7 @@
 
 #include "utils/xml.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <vector>
 
@@ -60,7 +60,8 @@ struct EquipmentBox final
  *
  * \ingroup Interface
  */
-class EquipmentWindow final : public Window, public gcn::ActionListener
+class EquipmentWindow final : public Window,
+                              public ActionListener
 {
     public:
         /**
@@ -81,11 +82,11 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
         /**
          * Draws the equipment window.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void mousePressed(gcn::MouseEvent& mouseEvent) override final;
+        void mousePressed(MouseEvent& mouseEvent) override final;
 
         const Item* getEquipment(const int i) const A_WARN_UNUSED
         { return mEquipment ? mEquipment->getEquipment(i) : nullptr; }
@@ -96,11 +97,11 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
 
         void resetBeing(const Being *const being);
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
         void recalcSize();
 
@@ -135,10 +136,10 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
         ImageSet *mImageSet;
         Being *mBeing;
         std::vector<EquipmentBox*> mBoxes;
-        gcn::Color mHighlightColor;
-        gcn::Color mBorderColor;
-        gcn::Color mLabelsColor;
-        gcn::Color mLabelsColor2;
+        Color mHighlightColor;
+        Color mBorderColor;
+        Color mLabelsColor;
+        Color mLabelsColor2;
         Image *mSlotBackground;
         Image *mSlotHighlightedBackground;
         ImageCollection *mVertexes;
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index eb2300e0e..fa9963217 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -24,7 +24,7 @@
 
 #include "configuration.h"
 
-#include "gui/sdlfont.h"
+#include "gui/gui.h"
 
 #include "gui/windows/didyouknowwindow.h"
 #include "gui/windows/setupwindow.h"
@@ -48,12 +48,13 @@
 HelpWindow::HelpWindow() :
     // TRANSLATORS: help window name
     Window(_("Help"), false, nullptr, "help.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     // TRANSLATORS: help window. button.
     mDYKButton(new Button(this, _("Did you know..."), "DYK", this)),
     mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
         "browserbox.xml")),
-    mScrollArea(new ScrollArea(mBrowserBox, true, "help_background.xml")),
+    mScrollArea(new ScrollArea(this, mBrowserBox,
+        true, "help_background.xml")),
     mTagFileMap()
 {
     setMinWidth(300);
@@ -72,7 +73,8 @@ HelpWindow::HelpWindow() :
     mBrowserBox->setOpaque(false);
 
     mBrowserBox->setLinkHandler(this);
-    mBrowserBox->setFont(gui->getHelpFont());
+    if (gui)
+        mBrowserBox->setFont(gui->getHelpFont());
     mBrowserBox->setProcessVersion(true);
     mBrowserBox->setEnableImages(true);
     mBrowserBox->setEnableKeys(true);
@@ -87,10 +89,10 @@ HelpWindow::HelpWindow() :
     loadWindowState();
     loadTags();
     enableVisibleSound(true);
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
 
-void HelpWindow::action(const gcn::ActionEvent &event)
+void HelpWindow::action(const ActionEvent &event)
 {
     if (event.getId() == "DYK")
     {
@@ -104,7 +106,7 @@ void HelpWindow::action(const gcn::ActionEvent &event)
 }
 
 void HelpWindow::handleLink(const std::string &link,
-                            gcn::MouseEvent *event A_UNUSED)
+                            MouseEvent *event A_UNUSED)
 {
     if (!strStartWith(link, "http://") && !strStartWith(link, "https://"))
     {
diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h
index 72c0d4aba..4290c99f9 100644
--- a/src/gui/windows/helpwindow.h
+++ b/src/gui/windows/helpwindow.h
@@ -26,7 +26,7 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include "localconsts.h"
 
@@ -44,8 +44,9 @@ typedef std::map<std::string, HelpNames> HelpTagsMap;
 /**
  * The help window.
  */
-class HelpWindow final : public Window, public LinkHandler,
-                         public gcn::ActionListener
+class HelpWindow final : public Window,
+                         public LinkHandler,
+                         public ActionListener
 {
     public:
         /**
@@ -58,13 +59,13 @@ class HelpWindow final : public Window, public LinkHandler,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Handles link action.
          */
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event A_UNUSED) override final;
+                        MouseEvent *event A_UNUSED) override final;
 
         /**
          * Loads help in the dialog.
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 6fd2ab95b..ee8c85f06 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -28,11 +28,16 @@
 
 #include "being/playerinfo.h"
 
+#include "events/keyevent.h"
+
 #include "input/inputmanager.h"
-#include "input/keyevent.h"
 
+#include "gui/font.h"
+#include "gui/gui.h"
 #include "gui/viewport.h"
 
+#include "gui/models/sortlistmodelinv.h"
+
 #include "gui/popups/textpopup.h"
 
 #include "gui/windows/equipmentwindow.h"
@@ -42,7 +47,6 @@
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/tradewindow.h"
 
-
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemcontainer.h"
@@ -57,53 +61,17 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
-
 #include <string>
 
 #include "debug.h"
 
-static const char *const SORT_NAME_INVENTORY[6] =
-{
-    // TRANSLATORS: inventory sort mode
-    N_("default"),
-    // TRANSLATORS: inventory sort mode
-    N_("by name"),
-    // TRANSLATORS: inventory sort mode
-    N_("by id"),
-    // TRANSLATORS: inventory sort mode
-    N_("by weight"),
-    // TRANSLATORS: inventory sort mode
-    N_("by amount"),
-    // TRANSLATORS: inventory sort mode
-    N_("by type")
-};
-
-class SortListModelInv final : public gcn::ListModel
-{
-public:
-    ~SortListModelInv()
-    { }
-
-    int getNumberOfElements() override final
-    { return 6; }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-
-        return gettext(SORT_NAME_INVENTORY[i]);
-    }
-};
-
 InventoryWindow::WindowList InventoryWindow::invInstances;
 
 InventoryWindow::InventoryWindow(Inventory *const inventory):
     Window("Inventory", false, nullptr, "inventory.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    KeyListener(),
+    SelectionListener(),
     InventoryListener(),
     mInventory(inventory),
     mItems(new ItemContainer(this, mInventory)),
@@ -183,8 +151,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
 
     mItems->addSelectionListener(this);
 
-    gcn::ScrollArea *const invenScroll = new ScrollArea(
-        mItems, getOptionBool("showbackground"), "inventory_background.xml");
+    gcn::ScrollArea *const invenScroll = new ScrollArea(this, mItems,
+        getOptionBool("showbackground"), "inventory_background.xml");
     invenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     const int size = config.getIntValue("fontSize");
@@ -295,7 +263,7 @@ void InventoryWindow::postInit()
     slotsChanged(mInventory);
 
     mItems->setSortType(mSortDropDown->getSelected());
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
     if (!isMainInventory())
         setVisible(true);
 }
@@ -335,7 +303,7 @@ void InventoryWindow::storeSortOrder()
     }
 }
 
-void InventoryWindow::action(const gcn::ActionEvent &event)
+void InventoryWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "outfit")
@@ -459,13 +427,13 @@ void InventoryWindow::unselectItem()
     mItems->selectNone();
 }
 
-void InventoryWindow::widgetHidden(const gcn::Event &event)
+void InventoryWindow::widgetHidden(const Event &event)
 {
     Window::widgetHidden(event);
     mItems->hidePopup();
 }
 
-void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
+void InventoryWindow::mouseClicked(MouseEvent &event)
 {
     Window::mouseClicked(event);
 
@@ -481,7 +449,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
         && inputManager.isActionActive(static_cast<int>(
         Input::KEY_STOP_ATTACK)));
 
-    if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
+    if (!mod && !mod2 && event.getButton() == MouseEvent::RIGHT)
     {
         Item *const item = mItems->getSelectedItem();
 
@@ -501,8 +469,8 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     if (!mInventory)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT
-        || event.getButton() == gcn::MouseEvent::RIGHT)
+    if (event.getButton() == MouseEvent::LEFT
+        || event.getButton() == MouseEvent::RIGHT)
     {
         Item *const item = mItems->getSelectedItem();
 
@@ -513,7 +481,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
         {
             if (mInventory->isMainInventory())
             {
-                if (event.getButton() == gcn::MouseEvent::RIGHT)
+                if (event.getButton() == MouseEvent::RIGHT)
                 {
                     ItemAmountWindow::showWindow(ItemAmountWindow::StoreAdd,
                         inventoryWindow, item);
@@ -527,7 +495,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
             }
             else
             {
-                if (event.getButton() == gcn::MouseEvent::RIGHT)
+                if (event.getButton() == MouseEvent::RIGHT)
                 {
                     ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove,
                         inventoryWindow, item);
@@ -544,7 +512,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
         {
             if (PlayerInfo::isItemProtected(item->getId()))
                 return;
-            if (event.getButton() == gcn::MouseEvent::RIGHT)
+            if (event.getButton() == MouseEvent::RIGHT)
             {
                 ItemAmountWindow::showWindow(ItemAmountWindow::TradeAdd,
                     tradeWindow, item);
@@ -588,15 +556,15 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     }
 }
 
-void InventoryWindow::mouseMoved(gcn::MouseEvent &event)
+void InventoryWindow::mouseMoved(MouseEvent &event)
 {
     Window::mouseMoved(event);
-    const gcn::Widget *const src = event.getSource();
+    const Widget *const src = event.getSource();
     if (src == mSlotsBar || src == mWeightBar)
     {
         const int x = event.getX();
         const int y = event.getY();
-        const gcn::Rectangle &rect = mDimension;
+        const Rect &rect = mDimension;
         mTextPopup->show(rect.x + x, rect.y + y, strprintf(_("Money: %s"),
             Units::formatCurrency(PlayerInfo::getAttribute(
             PlayerInfo::MONEY)).c_str()));
@@ -607,30 +575,24 @@ void InventoryWindow::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void InventoryWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void InventoryWindow::mouseExited(MouseEvent &event A_UNUSED)
 {
     mTextPopup->hide();
 }
 
-void InventoryWindow::keyPressed(gcn::KeyEvent &event)
+void InventoryWindow::keyPressed(KeyEvent &event)
 {
-    if (static_cast<KeyEvent*>(&event)->getActionId()
-        == static_cast<int>(Input::KEY_GUI_MOD))
-    {
+    if (event.getActionId() == static_cast<int>(Input::KEY_GUI_MOD))
         mSplit = true;
-    }
 }
 
-void InventoryWindow::keyReleased(gcn::KeyEvent &event)
+void InventoryWindow::keyReleased(KeyEvent &event)
 {
-    if (static_cast<KeyEvent*>(&event)->getActionId()
-        == static_cast<int>(Input::KEY_GUI_MOD))
-    {
+    if (event.getActionId() == static_cast<int>(Input::KEY_GUI_MOD))
         mSplit = false;
-    }
 }
 
-void InventoryWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
+void InventoryWindow::valueChanged(const SelectionEvent &event A_UNUSED)
 {
     if (!mInventory || !mInventory->isMainInventory())
         return;
@@ -812,7 +774,7 @@ bool InventoryWindow::isAnyInputFocused()
     return false;
 }
 
-void InventoryWindow::widgetResized(const gcn::Event &event)
+void InventoryWindow::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
 
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 4e32f6fa2..c81e83d77 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -24,19 +24,19 @@
 #define GUI_WINDOWS_INVENTORYWINDOW_H
 
 #include "inventory.h"
-#include "depricatedlistener.h"
+
+#include "listeners/depricatedlistener.h"
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
+#include "listeners/selectionlistener.h"
 
 class Button;
 class DropDown;
 class Item;
 class ItemContainer;
-class Label;
 class LayoutCell;
 class ProgressBar;
 class SortListModelInv;
@@ -50,9 +50,9 @@ class TextPopup;
  * \ingroup Interface
  */
 class InventoryWindow final : public Window,
-                              public gcn::ActionListener,
-                              public gcn::KeyListener,
-                              public gcn::SelectionListener,
+                              public ActionListener,
+                              public KeyListener,
+                              public SelectionListener,
                               public InventoryListener,
                               public DepricatedListener
 {
@@ -76,7 +76,7 @@ class InventoryWindow final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Returns the selected item.
@@ -91,27 +91,27 @@ class InventoryWindow final : public Window,
         /**
          * Handles closing of the window
          */
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         /**
          * Handles the mouse clicks.
          */
-        void mouseClicked(gcn::MouseEvent &event) override final;
+        void mouseClicked(MouseEvent &event) override final;
 
         /**
          * Handles the key presses.
          */
-        void keyPressed(gcn::KeyEvent &event) override final;
+        void keyPressed(KeyEvent &event) override final;
 
         /**
          * Handles the key releases.
          */
-        void keyReleased(gcn::KeyEvent &event) override final;
+        void keyReleased(KeyEvent &event) override final;
 
         /**
          * Updates labels to currently selected item.
          */
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
         /**
          * Sets whether the split button should be shown.
@@ -144,11 +144,11 @@ class InventoryWindow final : public Window,
 
         bool isInputFocused() const A_WARN_UNUSED;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
         void setVisible(bool visible) override final;
 
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 975892888..fc0c5880b 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -33,6 +33,8 @@
 #include "net/net.h"
 #include "gui/viewport.h"
 
+#include "gui/models/itemsmodel.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/shopwindow.h"
@@ -50,55 +52,6 @@
 
 #include "debug.h"
 
-class ItemsModal final : public gcn::ListModel
-{
-public:
-    ItemsModal() :
-        mStrings()
-    {
-        const std::map<int, ItemInfo*> &items = ItemDB::getItemInfos();
-        std::list<std::string> tempStrings;
-
-        for (std::map<int, ItemInfo*>::const_iterator
-             i = items.begin(), i_end = items.end();
-             i != i_end; ++i)
-        {
-            if (i->first < 0)
-                continue;
-
-            const ItemInfo &info = *i->second;
-            const std::string name = info.getName();
-            if (name != "unnamed" && !info.getName().empty()
-                && info.getName() != "unnamed")
-            {
-                tempStrings.push_back(name);
-            }
-        }
-        tempStrings.sort();
-        FOR_EACH (std::list<std::string>::const_iterator, i, tempStrings)
-            mStrings.push_back(*i);
-    }
-
-    A_DELETE_COPY(ItemsModal)
-
-    ~ItemsModal()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return static_cast<int>(mStrings.size());
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i < 0 || i >= getNumberOfElements())
-            return "???";
-        return mStrings.at(i);
-    }
-private:
-    StringVect mStrings;
-};
-
 void ItemAmountWindow::finish(Item *const item, const int amount,
                               const int price, const Usage usage)
 {
@@ -138,8 +91,8 @@ void ItemAmountWindow::finish(Item *const item, const int amount,
 ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
                                    Item *const item, const int maxRange) :
     Window("", false, parent, "amount.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mItemAmountTextField(new IntTextField(this, 1)),
     mItemPriceTextField(nullptr),
     mGPLabel(nullptr),
@@ -148,7 +101,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
     mMax(maxRange),
     mUsage(usage),
     mItemPopup(new ItemPopup),
-    mItemAmountSlide(new Slider(1.0, mMax)),
+    mItemAmountSlide(new Slider(this, 1.0, mMax)),
     mItemPriceSlide(nullptr),
     mItemDropDown(nullptr),
     mItemsModal(nullptr),
@@ -182,7 +135,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
         mItemPriceTextField->setWidth(35);
         mItemPriceTextField->addKeyListener(this);
 
-        mItemPriceSlide = new Slider(1.0, 10000000);
+        mItemPriceSlide = new Slider(this, 1.0, 10000000);
         mItemPriceSlide->setHeight(10);
         mItemPriceSlide->setActionEventId("slidePrice");
         mItemPriceSlide->addActionListener(this);
@@ -313,7 +266,7 @@ ItemAmountWindow::~ItemAmountWindow()
 }
 
 // Show ItemTooltip
-void ItemAmountWindow::mouseMoved(gcn::MouseEvent &event)
+void ItemAmountWindow::mouseMoved(MouseEvent &event)
 {
     Window::mouseMoved(event);
 
@@ -328,7 +281,7 @@ void ItemAmountWindow::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void ItemAmountWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void ItemAmountWindow::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
@@ -339,7 +292,7 @@ void ItemAmountWindow::resetAmount()
     mItemAmountTextField->setValue(1);
 }
 
-void ItemAmountWindow::action(const gcn::ActionEvent &event)
+void ItemAmountWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "cancel")
@@ -435,7 +388,7 @@ void ItemAmountWindow::close()
     scheduleDelete();
 }
 
-void ItemAmountWindow::keyReleased(gcn::KeyEvent &keyEvent A_UNUSED)
+void ItemAmountWindow::keyReleased(KeyEvent &keyEvent A_UNUSED)
 {
     mItemAmountSlide->setValue2(mItemAmountTextField->getValue());
 }
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 7625c4a71..cf721ee30 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 class DropDown;
 class Icon;
@@ -43,8 +43,8 @@ class Slider;
  * \ingroup Interface
  */
 class ItemAmountWindow final : public Window,
-                               public gcn::ActionListener,
-                               public gcn::KeyListener
+                               public ActionListener,
+                               public KeyListener
 {
     public:
         enum Usage
@@ -65,7 +65,7 @@ class ItemAmountWindow final : public Window,
         /**
          * Called when receiving actions from widget.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Sets default amount value.
@@ -73,16 +73,16 @@ class ItemAmountWindow final : public Window,
         void resetAmount();
 
         // MouseListener
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
         /**
          * Schedules the Item Amount window for deletion.
          */
         void close();
 
-        void keyReleased(gcn::KeyEvent &keyEvent) override final;
+        void keyReleased(KeyEvent &keyEvent) override final;
 
         /**
          * Creates the dialog, or bypass it if there aren't enough items.
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index 0adabc3ad..710875a3c 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -40,7 +40,7 @@
 KillStats::KillStats() :
     // TRANSLATORS: kill stats window name
     Window(_("Kill stats"), false, nullptr, "killstats.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mKillCounter(0),
     mExpCounter(0),
     mKillTCounter(0),
@@ -156,7 +156,7 @@ KillStats::~KillStats()
 {
 }
 
-void KillStats::action(const gcn::ActionEvent &event)
+void KillStats::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "reset")
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index 094147383..486ec9135 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -23,9 +23,8 @@
 #ifndef GUI_WINDOWS_KILLSTATS_H
 #define GUI_WINDOWS_KILLSTATS_H
 
-#include <guichan/actionlistener.hpp>
-
-#include "depricatedlistener.h"
+#include "listeners/actionlistener.h"
+#include "listeners/depricatedlistener.h"
 
 #include "gui/widgets/window.h"
 
@@ -33,7 +32,7 @@ class Label;
 class Button;
 
 class KillStats final : public Window,
-                        private gcn::ActionListener,
+                        private ActionListener,
                         public DepricatedListener
 {
     public:
@@ -52,7 +51,7 @@ class KillStats final : public Window,
         /**
          * Stuff.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void gainXp(int Xp);
 
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 8ec6144a0..71abf153a 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -25,8 +25,12 @@
 #include "client.h"
 #include "configuration.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
+
+#include "gui/models/updatelistmodel.h"
+#include "gui/models/updatetypemodel.h"
 
 #include "gui/windows/confirmdialog.h"
 
@@ -53,17 +57,17 @@ std::string LoginDialog::savedPasswordKey("");
 
 namespace
 {
-    struct OpenUrlListener : public gcn::ActionListener
+    struct OpenUrlListener : public ActionListener
     {
         OpenUrlListener() :
-            gcn::ActionListener(),
+            ActionListener(),
             url()
         {
         }
 
         A_DELETE_COPY(OpenUrlListener)
 
-        void action(const gcn::ActionEvent &event) override final
+        void action(const ActionEvent &event) override final
         {
             if (event.getId() == "yes")
                 openBrowser(url);
@@ -73,78 +77,12 @@ namespace
     } urlListener;
 }  // namespace
 
-const char *UPDATE_TYPE_TEXT[3] =
-{
-    // TRANSLATORS: update type
-    N_("Normal"),
-    // TRANSLATORS: update type
-    N_("Auto Close"),
-    // TRANSLATORS: update type
-    N_("Skip"),
-};
-
-class UpdateTypeModel final : public gcn::ListModel
-{
-    public:
-        UpdateTypeModel()
-        { }
-
-        A_DELETE_COPY(UpdateTypeModel)
-
-        ~UpdateTypeModel()
-        { }
-
-        int getNumberOfElements() override final
-        {
-            return 3;
-        }
-
-        std::string getElementAt(int i) override final
-        {
-            if (i >= getNumberOfElements() || i < 0)
-                return "???";
-            return gettext(UPDATE_TYPE_TEXT[i]);
-        }
-};
-
-class UpdateListModel final : public gcn::ListModel
-{
-    public:
-        explicit UpdateListModel(LoginData *const data) :
-            gcn::ListModel(),
-            mLoginData(data)
-        {
-        }
-
-        A_DELETE_COPY(UpdateListModel)
-
-        ~UpdateListModel()
-        { }
-
-        int getNumberOfElements() override final
-        {
-            if (!mLoginData)
-                return 0;
-            return static_cast<int>(mLoginData->updateHosts.size());
-        }
-
-        std::string getElementAt(int i) override final
-        {
-            if (!mLoginData || i >= getNumberOfElements() || i < 0)
-                return "???";
-            return mLoginData->updateHosts[i];
-        }
-
-    protected:
-        LoginData *mLoginData;
-};
-
 LoginDialog::LoginDialog(LoginData *const data, std::string serverName,
                          std::string *const updateHost):
     // TRANSLATORS: login dialog name
     Window(_("Login"), false, nullptr, "login.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mLoginData(data),
     mUserField(new TextField(this, mLoginData->username)),
     mPassField(new PasswordField(this, mLoginData->password)),
@@ -276,7 +214,7 @@ LoginDialog::~LoginDialog()
     mUpdateListModel = nullptr;
 }
 
-void LoginDialog::action(const gcn::ActionEvent &event)
+void LoginDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "login" && canSubmit())
@@ -318,7 +256,7 @@ void LoginDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void LoginDialog::keyPressed(KeyEvent &keyEvent)
 {
     if (keyEvent.isConsumed())
     {
@@ -326,16 +264,15 @@ void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
         return;
     }
 
-    const int actionId = static_cast<KeyEvent*>(
-        &keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
     {
-        action(gcn::ActionEvent(nullptr, mServerButton->getActionEventId()));
+        action(ActionEvent(nullptr, mServerButton->getActionEventId()));
     }
     else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
              || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
     {
-        action(gcn::ActionEvent(nullptr, mLoginButton->getActionEventId()));
+        action(ActionEvent(nullptr, mLoginButton->getActionEventId()));
     }
     else
     {
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index c9d2ad61f..7150b62c1 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 #include <string>
 
@@ -44,8 +44,9 @@ class UpdateTypeModel;
  *
  * \ingroup Interface
  */
-class LoginDialog final : public Window, public gcn::ActionListener,
-                          public gcn::KeyListener
+class LoginDialog final : public Window,
+                          public ActionListener,
+                          public KeyListener
 {
     public:
         /**
@@ -65,12 +66,12 @@ class LoginDialog final : public Window, public gcn::ActionListener,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Called when a key is pressed in one of the text fields.
          */
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
         void close() override final;
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 02be64a13..ef1830763 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -213,7 +213,7 @@ void Minimap::setMap(const Map *const map)
             setHeight(height);
         }
 
-        const gcn::Rectangle &rect = mDimension;
+        const Rect &rect = mDimension;
         setDefaultSize(rect.x, rect.y, rect.width, rect.height);
         resetToDefaultSize();
 
@@ -233,7 +233,7 @@ void Minimap::toggle()
     mShow = isWindowVisible();
 }
 
-void Minimap::draw(gcn::Graphics *graphics)
+void Minimap::draw(Graphics *graphics)
 {
     BLOCK_START("Minimap::draw")
     Window::draw(graphics);
@@ -244,9 +244,7 @@ void Minimap::draw(gcn::Graphics *graphics)
         return;
     }
 
-    Graphics *const graph = static_cast<Graphics*>(graphics);
-
-    const gcn::Rectangle a = getChildrenArea();
+    const Rect a = getChildrenArea();
 
     graphics->pushClipArea(a);
 
@@ -286,7 +284,7 @@ void Minimap::draw(gcn::Graphics *graphics)
                 mMapOriginY = 0;
         }
 
-        graph->drawImage2(mMapImage, mMapOriginX, mMapOriginY);
+        graphics->drawImage(mMapImage, mMapOriginX, mMapOriginY);
     }
 
     const ActorSprites &actors = actorManager->getAll();
@@ -348,7 +346,7 @@ void Minimap::draw(gcn::Graphics *graphics)
                 dotSize - 1) * mWidthProportion);
         const Vector &pos = being->getPosition();
 
-        graphics->fillRectangle(gcn::Rectangle(
+        graphics->fillRectangle(Rect(
             static_cast<float>(pos.x * mWidthProportion) / 32
             + mMapOriginX - offsetWidth,
             static_cast<float>(pos.y * mHeightProportion) / 32
@@ -386,7 +384,7 @@ void Minimap::draw(gcn::Graphics *graphics)
                         const int offsetWidth = static_cast<int>(
                             mWidthProportion);
 
-                        graphics->fillRectangle(gcn::Rectangle(
+                        graphics->fillRectangle(Rect(
                             static_cast<int>(member->getX()
                             * mWidthProportion) + mMapOriginX - offsetWidth,
                             static_cast<int>(member->getY()
@@ -401,8 +399,8 @@ void Minimap::draw(gcn::Graphics *graphics)
 
     const Vector &pos = player_node->getPosition();
 
-    const int gw = graph->getWidth();
-    const int gh = graph->getHeight();
+    const int gw = graphics->getWidth();
+    const int gh = graphics->getHeight();
     int x = static_cast<float>((pos.x - (gw / 2)
         + viewport->getCameraRelativeX())
         * mWidthProportion) / 32 + mMapOriginX;
@@ -431,19 +429,19 @@ void Minimap::draw(gcn::Graphics *graphics)
     }
 
     graphics->setColor(userPalette->getColor(UserPalette::PC));
-    graphics->drawRectangle(gcn::Rectangle(x, y, w, h));
+    graphics->drawRectangle(Rect(x, y, w, h));
     graphics->popClipArea();
     BLOCK_END("Minimap::draw")
 }
 
-void Minimap::mouseReleased(gcn::MouseEvent &event)
+void Minimap::mouseReleased(MouseEvent &event)
 {
     Window::mouseReleased(event);
 
     if (!player_node || !viewport)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         int x = event.getX();
         int y = event.getY();
@@ -451,7 +449,7 @@ void Minimap::mouseReleased(gcn::MouseEvent &event)
 
         player_node->navigateTo(x, y);
     }
-    else if (event.getButton() == gcn::MouseEvent::RIGHT)
+    else if (event.getButton() == MouseEvent::RIGHT)
     {
         int x = event.getX();
         int y = event.getY();
@@ -460,16 +458,16 @@ void Minimap::mouseReleased(gcn::MouseEvent &event)
     }
 }
 
-void Minimap::mouseMoved(gcn::MouseEvent &event)
+void Minimap::mouseMoved(MouseEvent &event)
 {
     Window::mouseMoved(event);
     const int x = event.getX();
     const int y = event.getY();
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     mTextPopup->show(x + rect.x, y + rect.y, mCaption);
 }
 
-void Minimap::mouseExited(gcn::MouseEvent &event)
+void Minimap::mouseExited(MouseEvent &event)
 {
     Window::mouseExited(event);
     mTextPopup->hide();
@@ -477,7 +475,7 @@ void Minimap::mouseExited(gcn::MouseEvent &event)
 
 void Minimap::screenToMap(int &x, int &y)
 {
-    const gcn::Rectangle a = getChildrenArea();
+    const Rect a = getChildrenArea();
     x = (x - a.x - mMapOriginX + mWidthProportion) / mWidthProportion;
     y = (y - a.y - mMapOriginY + mHeightProportion) / mHeightProportion;
 }
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 90c08db0f..d99aea13d 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -60,13 +60,13 @@ class Minimap final : public Window, public ConfigListener
         /**
          * Draws the minimap.
          */
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void mouseMoved(gcn::MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) override final;
 
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
         void screenToMap(int &x, int &y);
 
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index b5832c7b7..db4555b26 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -308,21 +308,21 @@ void MiniStatusWindow::logic()
     BLOCK_END("MiniStatusWindow::logic")
 }
 
-void MiniStatusWindow::draw(gcn::Graphics *graphics)
+void MiniStatusWindow::draw(Graphics *graphics)
 {
     BLOCK_START("MiniStatusWindow::draw")
     drawChildren(graphics);
     BLOCK_END("MiniStatusWindow::draw")
 }
 
-void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
+void MiniStatusWindow::mouseMoved(MouseEvent &event)
 {
     Popup::mouseMoved(event);
 
     const int x = event.getX();
     const int y = event.getY();
 
-    const gcn::Rectangle &rect = mDimension;
+    const Rect &rect = mDimension;
     if (event.getSource() == mStatusBar)
     {
         mStatusPopup->view(x + rect.x, y + rect.y);
@@ -433,12 +433,12 @@ void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void MiniStatusWindow::mousePressed(gcn::MouseEvent &event)
+void MiniStatusWindow::mousePressed(MouseEvent &event)
 {
     if (!viewport)
         return;
 
-    if (event.getButton() == gcn::MouseEvent::RIGHT)
+    if (event.getButton() == MouseEvent::RIGHT)
     {
         const ProgressBar *const bar = dynamic_cast<ProgressBar*>(
             event.getSource());
@@ -452,7 +452,7 @@ void MiniStatusWindow::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void MiniStatusWindow::mouseExited(gcn::MouseEvent &event)
+void MiniStatusWindow::mouseExited(MouseEvent &event)
 {
     Popup::mouseExited(event);
 
@@ -535,12 +535,12 @@ void MiniStatusWindow::updateArrows()
     StatusWindow::updateArrowsBar(mArrowsBar);
 }
 
-gcn::Rectangle MiniStatusWindow::getChildrenArea()
+Rect MiniStatusWindow::getChildrenArea()
 {
     const int padding = mPadding;
     const int padding2 = padding * 2;
-    const gcn::Rectangle &rect = mDimension;
-    return gcn::Rectangle(padding, padding,
+    const Rect &rect = mDimension;
+    return Rect(padding, padding,
         rect.width - padding2,
         rect.height - padding2);
 }
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 2a5903eca..0344d6c3a 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -24,7 +24,8 @@
 #define GUI_WINDOWS_MINISTATUSWINDOW_H
 
 #include "inventory.h"
-#include "depricatedlistener.h"
+
+#include "listeners/depricatedlistener.h"
 
 #include "gui/widgets/popup.h"
 
@@ -68,13 +69,13 @@ class MiniStatusWindow final : public Popup,
 
         void logic() override final;
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void mouseMoved(gcn::MouseEvent &mouseEvent) override final;
+        void mouseMoved(MouseEvent &mouseEvent) override final;
 
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
-        void mouseExited(gcn::MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) override final;
 
         void showBar(const std::string &name, const bool visible);
 
@@ -87,7 +88,7 @@ class MiniStatusWindow final : public Popup,
         std::vector <ProgressBar*> &getBars() A_WARN_UNUSED
         { return mBars; }
 
-        gcn::Rectangle getChildrenArea() override final A_WARN_UNUSED;
+        Rect getChildrenArea() override final A_WARN_UNUSED;
 
 #ifdef USE_PROFILER
         void logicChildren();
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index b441b724c..a1b2109fb 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -32,8 +32,8 @@
 
 #include "being/being.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 #include "gui/viewport.h"
 
 #include "gui/windows/inventorywindow.h"
@@ -59,8 +59,6 @@
 #include "utils/copynpaste.h"
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 // TRANSLATORS: npc dialog button
@@ -80,18 +78,18 @@ typedef std::vector<Image *>::iterator ImageVectorIter;
 NpcDialog::NpcDialog(const int npcId) :
     // TRANSLATORS: npc dialog name
     Window(_("NPC"), false, nullptr, "npc.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mNpcId(npcId),
     mDefaultInt(0),
     mDefaultString(),
     mTextBox(new BrowserBox(this, BrowserBox::AUTO_WRAP, true,
         "browserbox.xml")),
-    mScrollArea(new ScrollArea(mTextBox,
+    mScrollArea(new ScrollArea(this, mTextBox,
         getOptionBool("showtextbackground"), "npc_textbackground.xml")),
     mText(),
     mNewText(),
     mItemList(new ExtendedListBox(this, this, "extendedlistbox.xml")),
-    mListScrollArea(new ScrollArea(mItemList,
+    mListScrollArea(new ScrollArea(this, mItemList,
         getOptionBool("showlistbackground"), "npc_listbackground.xml")),
     mItems(),
     mImages(),
@@ -113,7 +111,7 @@ NpcDialog::NpcDialog(const int npcId) :
     mResetButton(new Button(this, _("Reset"), "reset", this)),
     mInventory(new Inventory(Inventory::NPC, 1)),
     mItemContainer(new ItemContainer(this, mInventory)),
-    mItemScrollArea(new ScrollArea(mItemContainer,
+    mItemScrollArea(new ScrollArea(this, mItemContainer,
         getOptionBool("showitemsbackground"), "npc_listbackground.xml")),
     mInputState(NPC_INPUT_NONE),
     mActionState(NPC_ACTION_WAIT),
@@ -170,7 +168,7 @@ NpcDialog::NpcDialog(const int npcId) :
     mTextField->setVisible(true);
     mIntField->setVisible(true);
 
-    const gcn::Font *const fnt = mButton->getFont();
+    const Font *const fnt = mButton->getFont();
     int width = std::max(fnt->getWidth(CAPTION_WAITING),
         fnt->getWidth(CAPTION_NEXT));
     width = std::max(width, fnt->getWidth(CAPTION_CLOSE));
@@ -295,7 +293,7 @@ void NpcDialog::showCloseButton()
     buildLayout();
 }
 
-void NpcDialog::action(const gcn::ActionEvent &event)
+void NpcDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "ok")
@@ -965,10 +963,10 @@ void NpcDialog::clearDialogs()
     mNpcDialogs.clear();
 }
 
-void NpcDialog::mousePressed(gcn::MouseEvent &event)
+void NpcDialog::mousePressed(MouseEvent &event)
 {
     Window::mousePressed(event);
-    if (event.getButton() == gcn::MouseEvent::RIGHT
+    if (event.getButton() == MouseEvent::RIGHT
         && event.getSource() == mTextBox)
     {
         if (viewport)
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 5e679d7d1..5188c2fe2 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -23,14 +23,15 @@
 #ifndef GUI_WINDOWS_NPCDIALOG_H
 #define GUI_WINDOWS_NPCDIALOG_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
+
+#include "gui/models/extendedlistmodel.h"
 
-#include "gui/widgets/extendedlistmodel.h"
 #include "gui/widgets/window.h"
 
 #include "utils/stringvector.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <list>
 
@@ -45,7 +46,6 @@ class ItemContainer;
 class NpcDialog;
 class PlayerBox;
 class ScrollArea;
-class TextBox;
 class TextField;
 
 typedef std::map<int, NpcDialog*> NpcDialogs;
@@ -56,7 +56,7 @@ typedef std::map<int, NpcDialog*> NpcDialogs;
  * \ingroup Interface
  */
 class NpcDialog final : public Window,
-                        public gcn::ActionListener,
+                        public ActionListener,
                         public ExtendedListModel,
                         public ConfigListener
 {
@@ -77,7 +77,7 @@ class NpcDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
         * Sets the text shows in the dialog.
@@ -210,7 +210,7 @@ class NpcDialog final : public Window,
 
         void clearRows();
 
-        void mousePressed(gcn::MouseEvent &event);
+        void mousePressed(MouseEvent &event);
 
         int isCloseState() const
         { return mActionState == NPC_ACTION_CLOSE; }
diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp
index 63ae6f53b..3c63775fe 100644
--- a/src/gui/windows/npcpostdialog.cpp
+++ b/src/gui/windows/npcpostdialog.cpp
@@ -42,7 +42,7 @@ NpcPostDialog::DialogList NpcPostDialog::instances;
 NpcPostDialog::NpcPostDialog(const int npcId):
     // TRANSLATORS: npc post dialog caption
     Window(_("NPC"), false, nullptr, "npcpost.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mNpcId(npcId),
     mText(new TextBox(this)),
     mSender(new TextField(this))
@@ -74,9 +74,9 @@ void NpcPostDialog::postInit()
     mText->setEditable(true);
 
     // create scroll box for letter text
-    ScrollArea *const scrollArea = new ScrollArea(mText);
+    ScrollArea *const scrollArea = new ScrollArea(this, mText);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    scrollArea->setDimension(gcn::Rectangle(
+    scrollArea->setDimension(Rect(
                 5, mSender->getHeight() + 5,
                 380, 140 - (mSender->getHeight() + sendButton->getHeight())));
 
@@ -98,7 +98,7 @@ NpcPostDialog::~NpcPostDialog()
     instances.remove(this);
 }
 
-void NpcPostDialog::action(const gcn::ActionEvent &event)
+void NpcPostDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "send")
diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h
index e111f150e..5396aad6e 100644
--- a/src/gui/windows/npcpostdialog.h
+++ b/src/gui/windows/npcpostdialog.h
@@ -25,13 +25,13 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class TextBox;
 class TextField;
 
 class NpcPostDialog final : public Window,
-                            public gcn::ActionListener
+                            public ActionListener
 {
     public:
         /**
@@ -48,7 +48,7 @@ class NpcPostDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void setVisible(bool visible) override final;
 
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp
index c16123abd..3d734b7ad 100644
--- a/src/gui/windows/okdialog.cpp
+++ b/src/gui/windows/okdialog.cpp
@@ -30,7 +30,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
@@ -40,7 +40,7 @@ OkDialog::OkDialog(const std::string &restrict title,
                    const bool showCenter, Window *const parent,
                    const int minWidth) :
     Window(title, modal, parent, "ok.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mTextBox(new TextBox(this))
 {
     mTextBox->setEditable(false);
@@ -84,7 +84,7 @@ OkDialog::OkDialog(const std::string &restrict title,
         soundManager.playGuiSound(SOUND_ERROR);
 }
 
-void OkDialog::action(const gcn::ActionEvent &event)
+void OkDialog::action(const ActionEvent &event)
 {
     setActionEventId(event.getId());
     distributeActionEvent();
diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h
index 7d2ff070b..b8236dfbc 100644
--- a/src/gui/windows/okdialog.h
+++ b/src/gui/windows/okdialog.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class TextBox;
 
@@ -44,7 +44,7 @@ enum
  * \ingroup GUI
  */
 class OkDialog final : public Window,
-                       public gcn::ActionListener
+                       public ActionListener
 {
     public:
         /**
@@ -63,7 +63,7 @@ class OkDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
     private:
         TextBox *mTextBox;
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index d686056ac..6fcea7d3a 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -51,7 +51,7 @@
 OutfitWindow::OutfitWindow():
     // TRANSLATORS: outfits window name
     Window(_("Outfits"), false, nullptr, "outfits.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     // TRANSLATORS: outfits window button
     mPreviousButton(new Button(this, _("<"), "previous", this)),
     // TRANSLATORS: outfits window button
@@ -91,8 +91,8 @@ OutfitWindow::OutfitWindow():
     setMinWidth(145);
     setMinHeight(220);
 
-    mCurrentLabel->setAlignment(gcn::Graphics::CENTER);
-    mKeyLabel->setAlignment(gcn::Graphics::CENTER);
+    mCurrentLabel->setAlignment(Graphics::CENTER);
+    mKeyLabel->setAlignment(Graphics::CENTER);
 
     mUnequipCheck->setActionEventId("unequip");
     mUnequipCheck->addActionListener(this);
@@ -225,7 +225,7 @@ void OutfitWindow::save() const
     serverConfig.setValue("OutfitAwayIndex", mAwayOutfit);
 }
 
-void OutfitWindow::action(const gcn::ActionEvent &event)
+void OutfitWindow::action(const ActionEvent &event)
 {
     const std::string eventId = event.getId();
     if (eventId == "next")
@@ -310,11 +310,10 @@ void OutfitWindow::copyOutfit(const int src, const int dst)
     save();
 }
 
-void OutfitWindow::draw(gcn::Graphics *graphics)
+void OutfitWindow::draw(Graphics *graphics)
 {
     BLOCK_START("OutfitWindow::draw")
     Window::draw(graphics);
-    Graphics *const g = static_cast<Graphics*>(graphics);
 
     if (mCurrentOutfit < 0 || mCurrentOutfit
         >= static_cast<signed int>(OUTFITS_COUNT))
@@ -326,12 +325,12 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
     {
         const int itemX = mPadding + ((i % mGridWidth) * mBoxWidth);
         const int itemY = mPadding + mTitleBarHeight
-            + ((i / mGridWidth) * mBoxHeight);
+            + ((i / static_cast<unsigned int>(mGridWidth)) * mBoxHeight);
 
         graphics->setColor(mBorderColor);
-        graphics->drawRectangle(gcn::Rectangle(itemX, itemY, 32, 32));
+        graphics->drawRectangle(Rect(itemX, itemY, 32, 32));
         graphics->setColor(mBackgroundColor);
-        graphics->fillRectangle(gcn::Rectangle(itemX, itemY, 32, 32));
+        graphics->fillRectangle(Rect(itemX, itemY, 32, 32));
 
         if (mItems[mCurrentOutfit][i] < 0)
             continue;
@@ -348,7 +347,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
                 const Image *const image = item->getImage();
                 if (image)
                 {
-                    g->drawImage2(image, itemX, itemY);
+                    graphics->drawImage(image, itemX, itemY);
                     foundItem = true;
                 }
             }
@@ -359,7 +358,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
                 mItemColors[mCurrentOutfit][i]);
             if (image)
             {
-                g->drawImage2(image, itemX, itemY);
+                graphics->drawImage(image, itemX, itemY);
                 image->decRef();
             }
         }
@@ -367,9 +366,9 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
     BLOCK_END("OutfitWindow::draw")
 }
 
-void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
+void OutfitWindow::mouseDragged(MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (dragDrop.isEmpty() && mItemClicked)
         {
@@ -410,12 +409,12 @@ void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
     Window::mouseDragged(event);
 }
 
-void OutfitWindow::mousePressed(gcn::MouseEvent &event)
+void OutfitWindow::mousePressed(MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
     if (index == -1)
     {
-        if (event.getButton() == gcn::MouseEvent::RIGHT && viewport)
+        if (event.getButton() == MouseEvent::RIGHT && viewport)
         {
             viewport->showOutfitsPopup();
             event.consume();
@@ -447,9 +446,9 @@ void OutfitWindow::mousePressed(gcn::MouseEvent &event)
     Window::mousePressed(event);
 }
 
-void OutfitWindow::mouseReleased(gcn::MouseEvent &event)
+void OutfitWindow::mouseReleased(MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         if (mCurrentOutfit < 0 || mCurrentOutfit
             >= static_cast<signed int>(OUTFITS_COUNT))
@@ -484,7 +483,7 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event)
 
 int OutfitWindow::getIndexFromGrid(const int pointX, const int pointY) const
 {
-    const gcn::Rectangle tRect = gcn::Rectangle(mPadding, mTitleBarHeight,
+    const Rect tRect = Rect(mPadding, mTitleBarHeight,
         mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
     if (!tRect.isPointInRect(pointX, pointY))
         return -1;
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index eeedc2ec6..55948f834 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 const unsigned int OUTFITS_COUNT = 100;
 const unsigned int OUTFIT_ITEM_COUNT = 16;
@@ -35,7 +35,7 @@ class CheckBox;
 class Label;
 
 class OutfitWindow final : public Window,
-                           private gcn::ActionListener
+                           private ActionListener
 {
     public:
         /**
@@ -50,15 +50,15 @@ class OutfitWindow final : public Window,
          */
         ~OutfitWindow();
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void draw(gcn::Graphics *graphics) override final;
+        void draw(Graphics *graphics) override final;
 
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
-        void mouseReleased(gcn::MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) override final;
 
         void load(const bool oldConfig = false);
 
@@ -115,8 +115,8 @@ class OutfitWindow final : public Window,
         int mItems[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT];
         int mAwayOutfit;
 
-        gcn::Color mBorderColor;
-        gcn::Color mBackgroundColor;
+        Color mBorderColor;
+        Color mBackgroundColor;
         unsigned char mItemColors[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT];
         bool mItemClicked;
         bool mItemsUnequip[OUTFITS_COUNT];
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index e5f599f0f..eee3e4259 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -26,13 +26,15 @@
 
 #include "being/localplayer.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
+
+#include "gui/models/questsmodel.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/extendedlistbox.h"
-#include "gui/widgets/extendednamesmodel.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/scrollarea.h"
 
@@ -87,20 +89,6 @@ struct QuestItem final
     bool broken;
 };
 
-class QuestsModel final : public ExtendedNamesModel
-{
-    public:
-        QuestsModel() :
-            ExtendedNamesModel()
-        {
-        }
-
-        A_DELETE_COPY(QuestsModel)
-
-        ~QuestsModel()
-        { }
-};
-
 struct QuestEffect final
 {
     QuestEffect() :
@@ -122,15 +110,15 @@ struct QuestEffect final
 QuestsWindow::QuestsWindow() :
     // TRANSLATORS: quests window name
     Window(_("Quests"), false, nullptr, "quests.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mQuestsModel(new QuestsModel),
     mQuestsListBox(new ExtendedListBox(this,
         mQuestsModel, "extendedlistbox.xml")),
-    mQuestScrollArea(new ScrollArea(mQuestsListBox,
+    mQuestScrollArea(new ScrollArea(this, mQuestsListBox,
         getOptionBool("showlistbackground"), "quests_list_background.xml")),
     mItemLinkHandler(new ItemLinkHandler),
     mText(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, "browserbox.xml")),
-    mTextScrollArea(new ScrollArea(mText,
+    mTextScrollArea(new ScrollArea(this, mText,
         getOptionBool("showtextbackground"), "quests_text_background.xml")),
     // TRANSLATORS: quests window button
     mCloseButton(new Button(this, _("Close"), "close", this)),
@@ -166,7 +154,7 @@ QuestsWindow::QuestsWindow() :
     mText->setLinkHandler(mItemLinkHandler);
     mTextScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mQuestsListBox->setWidth(500);
-    if (gui->getNpcFont()->getHeight() < 20)
+    if (gui && gui->getNpcFont()->getHeight() < 20)
         mQuestsListBox->setRowHeight(20);
     else
         mQuestsListBox->setRowHeight(gui->getNpcFont()->getHeight());
@@ -318,7 +306,7 @@ void QuestsWindow::loadEffect(const int var, const XmlNodePtr node)
     mAllEffects.push_back(effect);
 }
 
-void QuestsWindow::action(const gcn::ActionEvent &event)
+void QuestsWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "select")
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index 7ecc86c84..9000fcaa9 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -27,7 +27,7 @@
 
 #include "utils/xml.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <map>
 #include <vector>
@@ -48,7 +48,7 @@ typedef std::map<int, const QuestEffect*> NpcQuestEffectMap;
 typedef NpcQuestEffectMap::const_iterator NpcQuestEffectMapCIter;
 
 class QuestsWindow final : public Window,
-                           public gcn::ActionListener
+                           public ActionListener
 {
     public:
         QuestsWindow();
@@ -57,7 +57,7 @@ class QuestsWindow final : public Window,
 
         ~QuestsWindow();
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void updateQuest(const int var, const int val);
 
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index ff9f669b7..98aa70c70 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -28,8 +28,9 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "gui/viewport.h"
 
@@ -49,8 +50,8 @@
 QuitDialog::QuitDialog(QuitDialog **const pointerToMe):
     // TRANSLATORS: quit dialog name
     Window(_("Quit"), true, nullptr, "quit.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mOptions(),
     // TRANSLATORS: quit dialog button
     mLogoutQuit(new RadioButton(this, _("Quit"), "quitdialog")),
@@ -147,7 +148,7 @@ void QuitDialog::placeOption(ContainerPlacer &placer,
     mOptions.push_back(option);
 }
 
-void QuitDialog::action(const gcn::ActionEvent &event)
+void QuitDialog::action(const ActionEvent &event)
 {
     soundManager.playGuiSound(SOUND_HIDE_WINDOW);
     if (event.getId() == "ok")
@@ -202,20 +203,19 @@ void QuitDialog::action(const gcn::ActionEvent &event)
     scheduleDelete();
 }
 
-void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void QuitDialog::keyPressed(KeyEvent &keyEvent)
 {
-    const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     int dir = 0;
 
     switch (actionId)
     {
         case Input::KEY_GUI_SELECT:
         case Input::KEY_GUI_SELECT2:
-            action(gcn::ActionEvent(nullptr, mOkButton->getActionEventId()));
+            action(ActionEvent(nullptr, mOkButton->getActionEventId()));
             break;
         case Input::KEY_GUI_CANCEL:
-            action(gcn::ActionEvent(nullptr,
-                mCancelButton->getActionEventId()));
+            action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
             break;
         case Input::KEY_GUI_UP:
             dir = -1;
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index ab395c7f4..8ce60d06c 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 #include <vector>
 
@@ -38,8 +38,9 @@ class RadioButton;
  *
  * \ingroup Interface
  */
-class QuitDialog final : public Window, public gcn::ActionListener,
-                         public gcn::KeyListener
+class QuitDialog final : public Window,
+                         public ActionListener,
+                         public KeyListener
 {
     public:
         /**
@@ -61,9 +62,9 @@ class QuitDialog final : public Window, public gcn::ActionListener,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
     private:
         void placeOption(ContainerPlacer &placer,
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index 1867b6b40..50344f223 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "gui/windows/okdialog.h"
 
@@ -44,7 +45,7 @@
 #include "debug.h"
 
 WrongDataNoticeListener::WrongDataNoticeListener():
-    gcn::ActionListener(),
+    ActionListener(),
     mTarget(nullptr)
 {
 }
@@ -54,7 +55,7 @@ void WrongDataNoticeListener::setTarget(TextField *const textField)
     mTarget = textField;
 }
 
-void WrongDataNoticeListener::action(const gcn::ActionEvent &event)
+void WrongDataNoticeListener::action(const ActionEvent &event)
 {
     if (event.getId() == "ok" && mTarget)
         mTarget->requestFocus();
@@ -63,8 +64,8 @@ void WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 RegisterDialog::RegisterDialog(LoginData *const data) :
     // TRANSLATORS: register dialog name
     Window(_("Register"), false, nullptr, "register.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mLoginData(data),
     mUserField(new TextField(this, mLoginData->username)),
     mPasswordField(new PasswordField(this, mLoginData->password)),
@@ -172,7 +173,7 @@ RegisterDialog::~RegisterDialog()
     mWrongDataNoticeListener = nullptr;
 }
 
-void RegisterDialog::action(const gcn::ActionEvent &event)
+void RegisterDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "cancel")
@@ -281,23 +282,22 @@ void RegisterDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void RegisterDialog::keyPressed(KeyEvent &keyEvent)
 {
     if (keyEvent.isConsumed())
     {
         mRegisterButton->setEnabled(canSubmit());
         return;
     }
-    const int actionId = static_cast<KeyEvent*>(
-        &keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
     {
-        action(gcn::ActionEvent(nullptr, mCancelButton->getActionEventId()));
+        action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
     }
     else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
              || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
     {
-        action(gcn::ActionEvent(nullptr, mRegisterButton->getActionEventId()));
+        action(ActionEvent(nullptr, mRegisterButton->getActionEventId()));
     }
     else
     {
diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h
index 66c3e40b7..1d5b5e48b 100644
--- a/src/gui/windows/registerdialog.h
+++ b/src/gui/windows/registerdialog.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 class Button;
 class LoginData;
@@ -38,7 +38,7 @@ class TextField;
  * to the field which contained wrong data when the Ok button was pressed on
  * the error notice.
  */
-class WrongDataNoticeListener final : public gcn::ActionListener
+class WrongDataNoticeListener final : public ActionListener
 {
     public:
         WrongDataNoticeListener();
@@ -47,7 +47,7 @@ class WrongDataNoticeListener final : public gcn::ActionListener
 
         void setTarget(TextField *const textField);
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
     private:
         TextField *mTarget;
 };
@@ -58,8 +58,8 @@ class WrongDataNoticeListener final : public gcn::ActionListener
  * \ingroup Interface
  */
 class RegisterDialog final : public Window,
-                             public gcn::ActionListener,
-                             public gcn::KeyListener
+                             public ActionListener,
+                             public KeyListener
 {
     public:
         /**
@@ -82,12 +82,12 @@ class RegisterDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override;
+        void action(const ActionEvent &event) override;
 
         /**
          * Called when a key is pressed in one of the text fields.
          */
-        void keyPressed(gcn::KeyEvent &keyEvent) override;
+        void keyPressed(KeyEvent &keyEvent) override;
 
         void close() override;
 
diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp
index 15389a9c3..8bfcc6728 100644
--- a/src/gui/windows/selldialog.cpp
+++ b/src/gui/windows/selldialog.cpp
@@ -30,11 +30,12 @@
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/tradewindow.h"
 
+#include "gui/models/shopitems.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
 
@@ -53,8 +54,8 @@ SellDialog::DialogList SellDialog::instances;
 SellDialog::SellDialog(const int npcId) :
     // TRANSLATORS: sell dialog name
     Window(_("Sell"), false, nullptr, "sell.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     mNpcId(npcId), mMaxItems(0), mAmountItems(0), mNick("")
 {
     init();
@@ -63,8 +64,8 @@ SellDialog::SellDialog(const int npcId) :
 SellDialog::SellDialog(const std::string &nick):
     // TRANSLATORS: sell dialog name
     Window(_("Sell"), false, nullptr, "sell.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     mNpcId(-1), mMaxItems(0), mAmountItems(0), mNick(nick)
 {
     init();
@@ -86,15 +87,15 @@ void SellDialog::init()
     mShopItemList = new ShopListBox(this, mShopItems, mShopItems);
     mShopItemList->postInit();
     mShopItemList->setProtectItems(true);
-    mScrollArea = new ScrollArea(mShopItemList,
+    mScrollArea = new ScrollArea(this, mShopItemList,
         getOptionBool("showbackground"), "sell_background.xml");
     mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    mSlider = new Slider(1.0);
+    mSlider = new Slider(this, 1.0);
 
     mQuantityLabel = new Label(this, strprintf(
         "%d / %d", mAmountItems, mMaxItems));
-    mQuantityLabel->setAlignment(gcn::Graphics::CENTER);
+    mQuantityLabel->setAlignment(Graphics::CENTER);
     // TRANSLATORS: sell dialog label
     mMoneyLabel = new Label(this, strprintf(_("Price: %s / Total: %s"),
                                       "", ""));
@@ -185,7 +186,7 @@ void SellDialog::addItem(const int id, const unsigned char color,
 }
 
 
-void SellDialog::action(const gcn::ActionEvent &event)
+void SellDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
 
@@ -257,20 +258,10 @@ void SellDialog::action(const gcn::ActionEvent &event)
             mMaxItems -= mAmountItems;
             while (mAmountItems > 0)
             {
-#ifdef MANASERV_SUPPORT
-                // This order is important, item->getCurrentInvIndex() would
-                // return the inventory index of the next Duplicate otherwise.
-                int itemIndex = item->getCurrentInvIndex();
-                const int sellCount = item->sellCurrentDuplicate(mAmountItems);
-                // For Manaserv, the Item id is to be given as index.
-                if ((Net::getNetworkType() == ServerInfo::MANASERV))
-                    itemIndex = item->getId();
-#else
                 // This order is important, item->getCurrentInvIndex() would
                 // return the inventory index of the next Duplicate otherwise.
                 const int itemIndex = item->getCurrentInvIndex();
                 const int sellCount = item->sellCurrentDuplicate(mAmountItems);
-#endif
                 Net::getNpcHandler()->sellItem(mNpcId, itemIndex, sellCount);
                 mAmountItems -= sellCount;
             }
@@ -291,7 +282,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
                 delete mShopItems->at(selectedItem);
                 mShopItems->erase(selectedItem);
 
-                gcn::Rectangle scroll;
+                Rect scroll;
                 scroll.y = mShopItemList->getRowHeight() * (selectedItem + 1);
                 scroll.height = mShopItemList->getRowHeight();
                 mShopItemList->showPart(scroll);
@@ -309,7 +300,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void SellDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
+void SellDialog::valueChanged(const SelectionEvent &event A_UNUSED)
 {
     // Reset amount of items and update labels
     mAmountItems = 1;
diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h
index 15db28f10..bd270919e 100644
--- a/src/gui/windows/selldialog.h
+++ b/src/gui/windows/selldialog.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/selectionlistener.h"
 
 class Button;
 class Item;
@@ -42,8 +42,8 @@ class Slider;
  * \ingroup Interface
  */
 class SellDialog final : public Window,
-                         private gcn::ActionListener,
-                         private gcn::SelectionListener
+                         private ActionListener,
+                         private SelectionListener
 {
     public:
         /**
@@ -80,14 +80,14 @@ class SellDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Updates labels according to selected item.
          *
          * @see SelectionListener::selectionChanged
          */
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
         /**
          * Gives Player's Money amount
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 3006922c3..af29da656 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -27,11 +27,16 @@
 #include "configuration.h"
 #include "main.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
+
+#include "gui/models/serverslistmodel.h"
 
+#include "gui/widgets/checkbox.h"
 #include "gui/windows/editserverdialog.h"
 #include "gui/windows/logindialog.h"
 
@@ -44,8 +49,6 @@
 #include "utils/gettext.h"
 #include "utils/langs.h"
 
-#include <guichan/font.hpp>
-
 #include <string>
 
 #include "debug.h"
@@ -60,19 +63,10 @@ static std::string serverTypeToString(const ServerInfo::Type type)
             return "TmwAthena";
         case ServerInfo::EVOL:
             return "Evol";
-#ifdef EATHENA_SUPPORT
         case ServerInfo::EATHENA:
+#ifdef EATHENA_SUPPORT
             return "eAthena";
 #endif
-#ifdef MANASERV_SUPPORT
-        case ServerInfo::MANASERV:
-            return "ManaServ";
-#else
-        case ServerInfo::MANASERV:
-#endif
-#ifndef EATHENA_SUPPORT
-        case ServerInfo::EATHENA:
-#endif
         default:
         case ServerInfo::UNKNOWN:
             return "";
@@ -87,60 +81,11 @@ static uint16_t defaultPortForServerType(const ServerInfo::Type type)
         case ServerInfo::EATHENA:
 #ifdef EATHENA_SUPPORT
             return 6900;
-#else
-            return 6901;
 #endif
         case ServerInfo::UNKNOWN:
         case ServerInfo::TMWATHENA:
         case ServerInfo::EVOL:
-#ifdef MANASERV_SUPPORT
-            return 6901;
-        case ServerInfo::MANASERV:
-            return 9601;
-#else
-        case ServerInfo::MANASERV:
             return 6901;
-#endif
-    }
-}
-
-ServersListModel::ServersListModel(ServerInfos *const servers,
-                                   ServerDialog *const parent) :
-        mServers(servers),
-        mVersionStrings(servers->size(), VersionString(0, "")),
-        mParent(parent)
-{
-}
-
-int ServersListModel::getNumberOfElements()
-{
-    MutexLocker lock = mParent->lock();
-    return static_cast<int>(mServers->size());
-}
-
-std::string ServersListModel::getElementAt(int elementIndex)
-{
-    MutexLocker lock = mParent->lock();
-    const ServerInfo &server = mServers->at(elementIndex);
-    std::string myServer;
-    myServer.append(server.hostname);
-    return myServer;
-}
-
-void ServersListModel::setVersionString(const int index,
-                                        const std::string &version)
-{
-    if (index < 0 || index >= static_cast<int>(mVersionStrings.size()))
-        return;
-
-    if (version.empty())
-    {
-        mVersionStrings[index] = VersionString(0, "");
-    }
-    else
-    {
-        mVersionStrings[index] = VersionString(
-            gui->getFont()->getWidth(version), version);
     }
 }
 
@@ -157,19 +102,18 @@ public:
         mHighlightColor = getThemeColor(Theme::HIGHLIGHT);
     }
 
-    void draw(gcn::Graphics *graphics) override final
+    void draw(Graphics *graphics) override final
     {
         if (!mListModel)
             return;
 
         ServersListModel *const model = static_cast<ServersListModel *const>(
             mListModel);
-        Graphics *const g = static_cast<Graphics*>(graphics);
 
         updateAlpha();
 
         mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
-        g->setColor(mHighlightColor);
+        graphics->setColor(mHighlightColor);
 
         const int height = getRowHeight();
         mNotSupportedColor.a = static_cast<int>(mAlpha * 255.0F);
@@ -177,13 +121,13 @@ public:
         // Draw filled rectangle around the selected list element
         if (mSelected >= 0)
         {
-            graphics->fillRectangle(gcn::Rectangle(mPadding,
+            graphics->fillRectangle(Rect(mPadding,
                 height * mSelected + mPadding, getWidth() - 2 * mPadding,
                 height));
         }
 
-        gcn::Font *const font1 = boldFont;
-        gcn::Font *const font2 = getFont();
+        Font *const font1 = boldFont;
+        Font *const font2 = getFont();
         const int fontHeight = font1->getHeight();
         const int pad1 = fontHeight + mPadding;
         const int pad2 = height / 4 + mPadding;
@@ -196,12 +140,12 @@ public:
 
             if (mSelected == i)
             {
-                g->setColorAll(mForegroundSelectedColor,
+                graphics->setColorAll(mForegroundSelectedColor,
                     mForegroundSelectedColor2);
             }
             else
             {
-                g->setColorAll(mForegroundColor, mForegroundColor2);
+                graphics->setColorAll(mForegroundColor, mForegroundColor2);
             }
 
             int top;
@@ -224,7 +168,7 @@ public:
 
             if (info.version.first > 0)
             {
-                g->setColorAll(mNotSupportedColor, mNotSupportedColor2);
+                graphics->setColorAll(mNotSupportedColor, mNotSupportedColor2);
                 font2->drawString(graphics, info.version.second,
                     width - info.version.first - mPadding, top);
             }
@@ -236,8 +180,8 @@ public:
         return 2 * getFont()->getHeight() + 5;
     }
 private:
-    gcn::Color mNotSupportedColor;
-    gcn::Color mNotSupportedColor2;
+    Color mNotSupportedColor;
+    Color mNotSupportedColor2;
 };
 
 
@@ -245,9 +189,9 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
                            const std::string &dir) :
     // TRANSLATORS: servers dialog name
     Window(_("Choose Your Server"), false, nullptr, "server.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    KeyListener(),
+    SelectionListener(),
     mMutex(),
     mDescription(new Label(this, std::string())),
     // TRANSLATORS: servers dialog button
@@ -294,7 +238,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
 
     mServersList->addMouseListener(this);
 
-    ScrollArea *const usedScroll = new ScrollArea(mServersList,
+    ScrollArea *const usedScroll = new ScrollArea(this, mServersList,
         getOptionBool("showbackground"), "server_background.xml");
     usedScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
@@ -405,7 +349,7 @@ void ServerDialog::connectToSelectedServer()
     client->setState(STATE_CONNECT_SERVER);
 }
 
-void ServerDialog::action(const gcn::ActionEvent &event)
+void ServerDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "connect")
@@ -445,9 +389,9 @@ void ServerDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void ServerDialog::keyPressed(KeyEvent &keyEvent)
 {
-    switch (static_cast<KeyEvent*>(&keyEvent)->getActionId())
+    switch (keyEvent.getActionId())
     {
         case Input::KEY_GUI_CANCEL:
             keyEvent.consume();
@@ -457,7 +401,7 @@ void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
         case Input::KEY_GUI_SELECT:
         case Input::KEY_GUI_SELECT2:
             keyEvent.consume();
-            action(gcn::ActionEvent(nullptr,
+            action(ActionEvent(nullptr,
                 mConnectButton->getActionEventId()));
             return;
 
@@ -495,7 +439,7 @@ void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
         mServersList->keyPressed(keyEvent);
 }
 
-void ServerDialog::valueChanged(const gcn::SelectionEvent &)
+void ServerDialog::valueChanged(const SelectionEvent &)
 {
     const int index = mServersList->getSelected();
     if (index == -1)
@@ -506,13 +450,13 @@ void ServerDialog::valueChanged(const gcn::SelectionEvent &)
     mDeleteButton->setEnabled(true);
 }
 
-void ServerDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
+void ServerDialog::mouseClicked(MouseEvent &mouseEvent)
 {
     if (mouseEvent.getClickCount() == 2 &&
         mouseEvent.getSource() == mServersList)
     {
-        action(gcn::ActionEvent(mConnectButton,
-                                mConnectButton->getActionEventId()));
+        action(ActionEvent(mConnectButton,
+            mConnectButton->getActionEventId()));
     }
 }
 
@@ -644,7 +588,7 @@ void ServerDialog::loadServers(const bool addNew)
             version = strprintf(_("requires v%s"), version.c_str());
         }
 
-        const gcn::Font *const font = gui->getFont();
+        const Font *const font = gui->getFont();
 
         for_each_xml_child_node(subNode, serverNode)
         {
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index ad6f554c6..39c82279e 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -24,66 +24,23 @@
 #define GUI_WINDOWS_SERVERDIALOG_H
 
 #include "gui/widgets/window.h"
-#include "gui/widgets/checkbox.h"
 
 #include "net/download.h"
 #include "net/serverinfo.h"
 
 #include "utils/mutex.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
+#include "listeners/selectionlistener.h"
 
 #include <string>
-#include <vector>
 
 class Button;
+class CheckBox;
 class Label;
 class ListBox;
-class ServerDialog;
-
-/**
- * Server and Port List Model
- */
-class ServersListModel final : public gcn::ListModel
-{
-    public:
-        typedef std::pair<int, std::string> VersionString;
-
-        ServersListModel(ServerInfos *const servers,
-                         ServerDialog *const parent);
-
-        A_DELETE_COPY(ServersListModel)
-
-        /**
-         * Used to get number of line in the list
-         */
-        int getNumberOfElements() override final A_WARN_UNUSED;
-
-        /**
-         * Used to get an element from the list
-         */
-        std::string getElementAt(int elementIndex)
-                                 override final A_WARN_UNUSED;
-
-        /**
-         * Used to get the corresponding Server struct
-         */
-        const ServerInfo &getServer(const int elementIndex) const A_WARN_UNUSED
-        { return mServers->at(elementIndex); }
-
-        void setVersionString(const int index, const std::string &version);
-
-    private:
-        typedef std::vector<VersionString> VersionStrings;
-
-        ServerInfos *mServers;
-        VersionStrings mVersionStrings;
-        ServerDialog *mParent;
-};
-
+class ServersListModel;
 
 /**
  * The server choice dialog.
@@ -91,9 +48,9 @@ class ServersListModel final : public gcn::ListModel
  * \ingroup Interface
  */
 class ServerDialog final : public Window,
-                           public gcn::ActionListener,
-                           public gcn::KeyListener,
-                           public gcn::SelectionListener
+                           public ActionListener,
+                           public KeyListener,
+                           public SelectionListener
 {
     public:
         /**
@@ -115,16 +72,16 @@ class ServerDialog final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
         /**
          * Called when the selected value changed in the servers list box.
          */
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
-        void mouseClicked(gcn::MouseEvent &mouseEvent) override final;
+        void mouseClicked(MouseEvent &mouseEvent) override final;
 
         void logic() override final;
 
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index 0780865aa..2bcac85a5 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -44,6 +44,7 @@
 #include "gui/widgets/tabs/setup_video.h"
 #include "gui/widgets/tabs/setup_visual.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
@@ -58,7 +59,7 @@ SetupWindow *setupWindow = nullptr;
 SetupWindow::SetupWindow() :
     // TRANSLATORS: setup window name
     Window(_("Setup"), false, nullptr, "setup.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mTabs(),
     mModsTab(nullptr),
     mWindowsToReset(),
@@ -112,7 +113,7 @@ void SetupWindow::postInit()
             mResetWindows = btn;
     }
 
-    mPanel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
+    mPanel->setDimension(Rect(5, 5, width - 10, height - 40));
     mPanel->enableScrollButtons(true);
 
     mTabs.push_back(new Setup_Video(this));
@@ -149,7 +150,7 @@ void SetupWindow::postInit()
 
     center();
 
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
     setInGame(false);
     enableVisibleSound(true);
 }
@@ -160,7 +161,7 @@ SetupWindow::~SetupWindow()
     mButtons.clear();
 }
 
-void SetupWindow::action(const gcn::ActionEvent &event)
+void SetupWindow::action(const ActionEvent &event)
 {
     if (Game::instance())
         Game::instance()->resetAdjustLevel();
@@ -260,16 +261,16 @@ void SetupWindow::setVisible(bool visible)
     Window::setVisible(visible);
 }
 
-void SetupWindow::widgetResized(const gcn::Event &event)
+void SetupWindow::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
 
-    const gcn::Rectangle area = getChildrenArea();
+    const Rect area = getChildrenArea();
     int x = area.width;
     const int height = area.height;
     const int width = area.width;
     const int buttonPadding = getOption("buttonPadding", 5);
-    mPanel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
+    mPanel->setDimension(Rect(5, 5, width - 10, height - 40));
     FOR_EACH (std::vector<Button*>::iterator, it, mButtons)
     {
         Button *const btn = *it;
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index f5406e8ac..38b3eb206 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <list>
 
@@ -41,7 +41,7 @@ class TabbedArea;
  * \ingroup GUI
  */
 class SetupWindow final : public Window,
-                          public gcn::ActionListener
+                          public ActionListener
 {
     public:
         SetupWindow();
@@ -52,7 +52,7 @@ class SetupWindow final : public Window,
 
         void postInit() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void setInGame(const bool inGame);
 
@@ -71,7 +71,7 @@ class SetupWindow final : public Window,
 
         void setVisible(bool visible) override final;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     private:
         void unloadModTab();
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index a940e4cdb..32e249d35 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -27,12 +27,13 @@
 #include "gui/windows/selldialog.h"
 #include "gui/windows/tradewindow.h"
 
+#include "gui/models/shopitems.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 
 #include "gui/widgets/tabs/chattab.h"
@@ -71,17 +72,17 @@ ShopWindow::DialogList ShopWindow::instances;
 ShopWindow::ShopWindow():
     // TRANSLATORS: shop window name
     Window(_("Personal Shop"), false, nullptr, "shop.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     // TRANSLATORS: shop window button
     mCloseButton(new Button(this, _("Close"), "close", this)),
     mBuyShopItems(new ShopItems),
     mSellShopItems(new ShopItems),
     mBuyShopItemList(new ShopListBox(this, mBuyShopItems, mBuyShopItems)),
     mSellShopItemList(new ShopListBox(this, mSellShopItems, mSellShopItems)),
-    mBuyScrollArea(new ScrollArea(mBuyShopItemList,
+    mBuyScrollArea(new ScrollArea(this, mBuyShopItemList,
         getOptionBool("showbuybackground"), "shop_buy_background.xml")),
-    mSellScrollArea(new ScrollArea(mSellShopItemList,
+    mSellScrollArea(new ScrollArea(this, mSellShopItemList,
         getOptionBool("showsellbackground"), "shop_sell_background.xml")),
     // TRANSLATORS: shop window label
     mBuyLabel(new Label(this, _("Buy items"))),
@@ -205,7 +206,7 @@ ShopWindow::~ShopWindow()
     instances.remove(this);
 }
 
-void ShopWindow::action(const gcn::ActionEvent &event)
+void ShopWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "close")
@@ -307,7 +308,7 @@ void ShopWindow::startTrade()
     mTradeNick.clear();
 }
 
-void ShopWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
+void ShopWindow::valueChanged(const SelectionEvent &event A_UNUSED)
 {
     updateButtonsAndLabels();
 }
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 95eee1e05..76971364b 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/selectionlistener.h"
 
 class Button;
 class CheckBox;
@@ -43,8 +43,8 @@ class ShopListBox;
  * \ingroup Interface
  */
 class ShopWindow final : public Window,
-                         public gcn::ActionListener,
-                         public gcn::SelectionListener
+                         public ActionListener,
+                         public SelectionListener
 {
     public:
         enum ShopMode
@@ -72,12 +72,12 @@ class ShopWindow final : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Updates the labels according to the selected item.
          */
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
         /**
          * Updates the state of buttons and labels.
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 96ec8c93c..5b3c03e90 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -40,7 +40,8 @@ class ShortcutTab final : public Tab
 {
     public:
         ShortcutTab(const Widget2 *const widget,
-                    std::string name, ShortcutContainer *const content) :
+                    std::string name,
+                    ShortcutContainer *const content) :
             Tab(widget),
             mContent(content)
         {
@@ -58,7 +59,7 @@ ShortcutWindow::ShortcutWindow(const std::string &restrict title,
                                int width, int height) :
     Window("Window", false, nullptr, skinFile),
     mItems(content),
-    mScrollArea(new ScrollArea(mItems, false)),
+    mScrollArea(new ScrollArea(this, mItems, false)),
     mTabs(nullptr),
     mPages()
 {
@@ -160,7 +161,7 @@ ShortcutWindow::~ShortcutWindow()
 void ShortcutWindow::addTab(const std::string &name,
                             ShortcutContainer *const content)
 {
-    ScrollArea *const scroll = new ScrollArea(content, false);
+    ScrollArea *const scroll = new ScrollArea(this, content, false);
     scroll->setPosition(SCROLL_PADDING, SCROLL_PADDING);
     scroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     content->setWidget2(this);
@@ -176,7 +177,7 @@ int ShortcutWindow::getTabIndex() const
     return mTabs->getSelectedTabIndex();
 }
 
-void ShortcutWindow::widgetHidden(const gcn::Event &event)
+void ShortcutWindow::widgetHidden(const Event &event)
 {
     if (mItems)
         mItems->widgetHidden(event);
@@ -195,21 +196,21 @@ void ShortcutWindow::widgetHidden(const gcn::Event &event)
     }
 }
 
-void ShortcutWindow::mousePressed(gcn::MouseEvent &event)
+void ShortcutWindow::mousePressed(MouseEvent &event)
 {
     Window::mousePressed(event);
 
     if (event.isConsumed())
         return;
 
-    if (event.getButton() == gcn::MouseEvent::LEFT)
+    if (event.getButton() == MouseEvent::LEFT)
     {
         mDragOffsetX = event.getX();
         mDragOffsetY = event.getY();
     }
 }
 
-void ShortcutWindow::mouseDragged(gcn::MouseEvent &event)
+void ShortcutWindow::mouseDragged(MouseEvent &event)
 {
     Window::mouseDragged(event);
 
@@ -226,7 +227,7 @@ void ShortcutWindow::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void ShortcutWindow::widgetMoved(const gcn::Event& event)
+void ShortcutWindow::widgetMoved(const Event& event)
 {
     Window::widgetMoved(event);
     if (mItems)
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index f4c417c94..5e36e68d7 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -60,13 +60,13 @@ class ShortcutWindow final : public Window
 
         int getTabIndex() const A_WARN_UNUSED;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event& event) override final;
+        void widgetMoved(const Event& event) override final;
 
-        void mousePressed(gcn::MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) override final;
 
-        void mouseDragged(gcn::MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) override final;
 
         void nextTab();
 
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 04baad26a..21cc009bc 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -29,10 +29,13 @@
 
 #include "being/localplayer.h"
 
+#include "gui/font.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/textpopup.h"
 
+#include "gui/models/skillmodel.h"
+
 #include "gui/windows/setupwindow.h"
 #include "gui/windows/shortcutwindow.h"
 
@@ -40,7 +43,6 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/skillmodel.h"
 #include "gui/widgets/tabs/tab.h"
 #include "gui/widgets/tabbedarea.h"
 
@@ -53,14 +55,13 @@
 
 #include "resources/beingcommon.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 class SkillListBox final : public ListBox
 {
     public:
-        SkillListBox(const Widget2 *const widget, SkillModel *const model) :
+        SkillListBox(const Widget2 *const widget,
+                     SkillModel *const model) :
             ListBox(widget, model, "skilllistbox.xml"),
             mModel(model),
             mPopup(new TextPopup),
@@ -100,15 +101,13 @@ class SkillListBox final : public ListBox
             return static_cast<SkillModel*>(mListModel)->getSkillAt(selected);
         }
 
-        void draw(gcn::Graphics *gcnGraphics) override
+        void draw(Graphics *graphics) override
         {
             if (!mListModel)
                 return;
 
             SkillModel *const model = static_cast<SkillModel*>(mListModel);
             updateAlpha();
-            Graphics *const graphics = static_cast<Graphics *const>(
-                gcnGraphics);
 
             mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
             graphics->setColor(mHighlightColor);
@@ -116,14 +115,14 @@ class SkillListBox final : public ListBox
             // Draw filled rectangle around the selected list element
             if (mSelected >= 0)
             {
-                graphics->fillRectangle(gcn::Rectangle(mPadding, getRowHeight()
+                graphics->fillRectangle(Rect(mPadding, getRowHeight()
                     * mSelected + mPadding, getWidth() - 2 * mPadding,
                     getRowHeight()));
             }
 
             // Draw the list elements
             graphics->setColorAll(mTextColor, mTextColor2);
-            gcn::Font *const font = getFont();
+            Font *const font = getFont();
             const int space = font->getHeight() + mSpacing;
             const int width2 = getWidth() - mPadding;
             for (int i = 0, y = 1;
@@ -136,7 +135,7 @@ class SkillListBox final : public ListBox
                     const SkillData *const data = e->data;
                     const int yPad = y + mPadding;
                     const std::string &description = data->description;
-                    graphics->drawImage2(data->icon, mPadding, yPad);
+                    graphics->drawImage(data->icon, mPadding, yPad);
                     font->drawString(graphics, data->name, mTextPadding, yPad);
                     if (!description.empty())
                     {
@@ -159,7 +158,7 @@ class SkillListBox final : public ListBox
         unsigned int getRowHeight() const override
         { return mRowHeight; }
 
-        const SkillInfo *getSkillByEvent(const gcn::MouseEvent &event) const
+        const SkillInfo *getSkillByEvent(const MouseEvent &event) const
         {
             const int y = (event.getY() + mPadding) / getRowHeight();
             if (!mModel || y >= mModel->getNumberOfElements())
@@ -170,7 +169,7 @@ class SkillListBox final : public ListBox
             return skill;
         }
 
-        void mouseMoved(gcn::MouseEvent &event) override
+        void mouseMoved(MouseEvent &event) override
         {
             ListBox::mouseMoved(event);
             if (!viewport || !dragDrop.isEmpty())
@@ -184,9 +183,9 @@ class SkillListBox final : public ListBox
                 skill->data->dispName, skill->data->description);
         }
 
-        void mouseDragged(gcn::MouseEvent &event)
+        void mouseDragged(MouseEvent &event)
         {
-            if (event.getButton() == gcn::MouseEvent::LEFT)
+            if (event.getButton() == MouseEvent::LEFT)
             {
                 if (dragDrop.isEmpty())
                 {
@@ -208,10 +207,10 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void mousePressed(gcn::MouseEvent &event)
+        void mousePressed(MouseEvent &event)
         {
             ListBox::mousePressed(event);
-            if (event.getButton() == gcn::MouseEvent::LEFT)
+            if (event.getButton() == MouseEvent::LEFT)
             {
                 const SkillInfo *const skill = getSkillByEvent(event);
                 if (!skill)
@@ -220,12 +219,12 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void mouseReleased(gcn::MouseEvent &event)
+        void mouseReleased(MouseEvent &event)
         {
             ListBox::mouseReleased(event);
         }
 
-        void mouseExited(gcn::MouseEvent &event A_UNUSED) override
+        void mouseExited(MouseEvent &event A_UNUSED) override
         {
             mPopup->hide();
         }
@@ -233,8 +232,8 @@ class SkillListBox final : public ListBox
     private:
         SkillModel *mModel;
         TextPopup *mPopup;
-        gcn::Color mTextColor;
-        gcn::Color mTextColor2;
+        Color mTextColor;
+        Color mTextColor2;
         int mTextPadding;
         int mSpacing;
         bool mSkillClicked;
@@ -244,7 +243,8 @@ class SkillTab final : public Tab
 {
     public:
         SkillTab(const Widget2 *const widget,
-                 const std::string &name, SkillListBox *const listBox) :
+                 const std::string &name,
+                 SkillListBox *const listBox) :
             Tab(widget),
             mListBox(listBox)
         {
@@ -281,7 +281,7 @@ class SkillTab final : public Tab
 SkillDialog::SkillDialog() :
     // TRANSLATORS: skills dialog name
     Window(_("Skills"), false, nullptr, "skills.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mSkills(),
     mTabs(new TabbedArea(this)),
     mDeleteTabs(),
@@ -323,7 +323,7 @@ SkillDialog::~SkillDialog()
     clearSkills();
 }
 
-void SkillDialog::action(const gcn::ActionEvent &event)
+void SkillDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "inc")
@@ -544,7 +544,7 @@ void SkillDialog::loadXmlFile(const std::string &fileName)
             SkillListBox *const listbox = new SkillListBox(this, model);
             listbox->setActionEventId("sel");
             listbox->addActionListener(this);
-            ScrollArea *const scroll = new ScrollArea(listbox, false);
+            ScrollArea *const scroll = new ScrollArea(this, listbox, false);
             scroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
             scroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
@@ -619,7 +619,7 @@ SkillInfo* SkillDialog::getSkillByItem(const int itemId) const
     return nullptr;
 }
 
-void SkillDialog::widgetResized(const gcn::Event &event)
+void SkillDialog::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
 
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 4a6182d38..3bf64df9b 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 const int SKILL_MIN_ID = 200000;
 const unsigned int SKILL_VAR_MIN_ID = 1000000;
@@ -43,7 +43,8 @@ struct SkillInfo;
  *
  * \ingroup Interface
  */
-class SkillDialog final : public Window, public gcn::ActionListener
+class SkillDialog final : public Window,
+                          public ActionListener
 {
     public:
         SkillDialog();
@@ -57,7 +58,7 @@ class SkillDialog final : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from widget.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Update the given skill's display
@@ -87,7 +88,7 @@ class SkillDialog final : public Window, public gcn::ActionListener
         bool hasSkills() const A_WARN_UNUSED
         { return !mSkills.empty(); }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void useItem(const int itemId) const;
 
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 2385066be..f33534a85 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -33,6 +33,8 @@
 
 #include "input/keyboardconfig.h"
 
+#include "gui/models/beingslistmodel.h"
+
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/okdialog.h"
 #include "gui/windows/setupwindow.h"
@@ -41,6 +43,7 @@
 
 #include "gui/windows/outfitwindow.h"
 
+#include "gui/widgets/avatarlistbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/label.h"
@@ -115,6 +118,11 @@ public:
     virtual void selectIndex(const unsigned num A_UNUSED)
     { }
 
+    virtual void buildCounter(const int online A_UNUSED = 0,
+                              const int total A_UNUSED = 0)
+    {
+    }
+
 protected:
     friend class SocialWindow;
 
@@ -157,11 +165,6 @@ protected:
             socialWindow->setCounter(this, mCounterString);
     }
 
-    virtual void buildCounter(const int online A_UNUSED = 0,
-                              const int total A_UNUSED = 0)
-    {
-    }
-
     TextDialog *mInviteDialog;
     ConfirmDialog *mConfirmDialog;
     ScrollArea *mScroll;
@@ -169,13 +172,14 @@ protected:
     std::string mCounterString;
 };
 
-class SocialGuildTab final : public SocialTab, public gcn::ActionListener
+class SocialGuildTab final : public SocialTab, public ActionListener
 {
 public:
     SocialGuildTab(const Widget2 *const widget,
-                   Guild *const guild, const bool showBackground) :
+                   Guild *const guild,
+                   const bool showBackground) :
         SocialTab(widget),
-        gcn::ActionListener(),
+        ActionListener(),
         mGuild(guild)
     {
         // TRANSLATORS: tab in social window
@@ -191,7 +195,7 @@ public:
 
         mList = new AvatarListBox(this, guild);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -208,7 +212,7 @@ public:
         mScroll = nullptr;
     }
 
-    void action(const gcn::ActionEvent &event) override final
+    void action(const ActionEvent &event) override final
     {
         const std::string &eventId = event.getId();
         if (eventId == "do invite")
@@ -305,13 +309,14 @@ private:
     Guild *mGuild;
 };
 
-class SocialGuildTab2 final : public SocialTab, public gcn::ActionListener
+class SocialGuildTab2 final : public SocialTab, public ActionListener
 {
 public:
-    SocialGuildTab2(const Widget2 *const widget, Guild *const guild,
+    SocialGuildTab2(const Widget2 *const widget,
+                    Guild *const guild,
                     const bool showBackground) :
         SocialTab(widget),
-        gcn::ActionListener()
+        ActionListener()
     {
         // TRANSLATORS: tab in social window
         setCaption(_("Guild"));
@@ -326,7 +331,7 @@ public:
 
         mList = new AvatarListBox(this, guild);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -343,7 +348,7 @@ public:
         mScroll = nullptr;
     }
 
-    void action(const gcn::ActionEvent &event A_UNUSED) override final
+    void action(const ActionEvent &event A_UNUSED) override final
     {
     }
 
@@ -372,13 +377,14 @@ public:
     }
 };
 
-class SocialPartyTab final : public SocialTab, public gcn::ActionListener
+class SocialPartyTab final : public SocialTab, public ActionListener
 {
 public:
     SocialPartyTab(const Widget2 *const widget,
-                   Party *const party, const bool showBackground) :
+                   Party *const party,
+                   const bool showBackground) :
         SocialTab(widget),
-        gcn::ActionListener(),
+        ActionListener(),
         mParty(party)
     {
         // TRANSLATORS: tab in social window
@@ -394,7 +400,7 @@ public:
 
         mList = new AvatarListBox(this, party);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -411,7 +417,7 @@ public:
         mScroll = nullptr;
     }
 
-    void action(const gcn::ActionEvent &event) override final
+    void action(const ActionEvent &event) override final
     {
         const std::string &eventId = event.getId();
         if (eventId == "do invite")
@@ -499,52 +505,18 @@ private:
     Party *mParty;
 };
 
-class BeingsListModal final : public AvatarListModel
-{
-public:
-    BeingsListModal() :
-        AvatarListModel(),
-        mMembers()
-    {
-    }
-
-    A_DELETE_COPY(BeingsListModal)
-
-    ~BeingsListModal()
-    {
-        delete_all(mMembers);
-        mMembers.clear();
-    }
-
-    std::vector<Avatar*> *getMembers()
-    {
-        return &mMembers;
-    }
-
-    Avatar *getAvatarAt(int index) override final
-    {
-        return mMembers[index];
-    }
-
-    int getNumberOfElements() override final
-    {
-        return static_cast<int>(mMembers.size());
-    }
-
-    std::vector<Avatar*> mMembers;
-};
-
 class SocialPlayersTab final : public SocialTab
 {
 public:
     SocialPlayersTab(const Widget2 *const widget,
-                     std::string name, const bool showBackground) :
+                     std::string name,
+                     const bool showBackground) :
         SocialTab(widget),
-        mBeings(new BeingsListModal)
+        mBeings(new BeingsListModel)
     {
         mList = new AvatarListBox(this, mBeings);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -696,7 +668,7 @@ public:
     }
 
 private:
-    BeingsListModal *mBeings;
+    BeingsListModel *mBeings;
 };
 
 
@@ -706,11 +678,11 @@ public:
     SocialNavigationTab(const Widget2 *const widget,
                         const bool showBackground) :
         SocialTab(widget),
-        mBeings(new BeingsListModal)
+        mBeings(new BeingsListModel)
     {
         mList = new AvatarListBox(this, mBeings);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -973,7 +945,7 @@ public:
     }
 
 private:
-    BeingsListModal *mBeings;
+    BeingsListModel *mBeings;
 };
 
 
@@ -1035,11 +1007,11 @@ public:
     SocialAttackTab(const Widget2 *const widget,
                     const bool showBackground) :
         SocialTab(widget),
-        mBeings(new BeingsListModal)
+        mBeings(new BeingsListModel)
     {
         mList = new AvatarListBox(this, mBeings);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -1073,7 +1045,7 @@ public:
     }
 
 private:
-    BeingsListModal *mBeings;
+    BeingsListModel *mBeings;
 };
 
 class SocialPickupTab final : public SocialTab
@@ -1082,11 +1054,11 @@ public:
     SocialPickupTab(const Widget2 *const widget,
                     const bool showBackground) :
         SocialTab(widget),
-        mBeings(new BeingsListModal)
+        mBeings(new BeingsListModel)
     {
         mList = new AvatarListBox(this, mBeings);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -1118,7 +1090,7 @@ public:
     }
 
 private:
-    BeingsListModal *mBeings;
+    BeingsListModel *mBeings;
 };
 
 
@@ -1126,13 +1098,14 @@ class SocialFriendsTab final : public SocialTab
 {
 public:
     SocialFriendsTab(const Widget2 *const widget,
-                     std::string name, const bool showBackground) :
+                     std::string name,
+                     const bool showBackground) :
         SocialTab(widget),
-        mBeings(new BeingsListModal)
+        mBeings(new BeingsListModel)
     {
         mList = new AvatarListBox(this, mBeings);
         mList->postInit();
-        mScroll = new ScrollArea(mList, showBackground,
+        mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
@@ -1208,7 +1181,7 @@ public:
     }
 
 private:
-    BeingsListModal *mBeings;
+    BeingsListModel *mBeings;
 };
 
 
@@ -1242,7 +1215,7 @@ public:
     A_DELETE_COPY(CreatePopup)
 
     void handleLink(const std::string &link,
-                    gcn::MouseEvent *event A_UNUSED) override final
+                    MouseEvent *event A_UNUSED) override final
     {
         if (link == "guild" && socialWindow)
         {
@@ -1256,7 +1229,7 @@ public:
         setVisible(false);
     }
 
-    void show(gcn::Widget *parent)
+    void show(Widget *parent)
     {
         if (!parent)
             return;
@@ -1276,7 +1249,7 @@ private:
 SocialWindow::SocialWindow() :
     // TRANSLATORS: social window name
     Window(_("Social"), false, nullptr, "social.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     PlayerRelationsListener(),
     mGuildInvited(0),
     mGuildAcceptDialog(nullptr),
@@ -1336,7 +1309,7 @@ void SocialWindow::postInit()
     place(0, 1, mCountLabel);
     place(0, 2, mTabs, 4, 4);
 
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 
     loadWindowState();
 
@@ -1482,7 +1455,7 @@ bool SocialWindow::removeTab(Party *const party)
     return true;
 }
 
-void SocialWindow::action(const gcn::ActionEvent &event)
+void SocialWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
 
@@ -1744,7 +1717,6 @@ void SocialWindow::slowLogic()
     const unsigned int nowTime = cur_time;
     if (mNeedUpdate && nowTime - mLastUpdateTime > 1)
     {
-        logger->log("soc update");
         mPlayers->updateList();
         mFriends->updateList();
         mNeedUpdate = false;
@@ -1863,7 +1835,7 @@ void SocialWindow::updateParty()
     }
 }
 
-void SocialWindow::widgetResized(const gcn::Event &event)
+void SocialWindow::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
     if (mTabs)
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index e8dc44043..57fbd5be5 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -24,9 +24,8 @@
 
 #include "gui/widgets/window.h"
 
-#include "being/playerrelationslistener.h"
-
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/playerrelationslistener.h"
 
 #include <string>
 #include <map>
@@ -48,7 +47,7 @@ class TextDialog;
  * \ingroup Interface
  */
 class SocialWindow final : public Window,
-                           private gcn::ActionListener,
+                           private ActionListener,
                            public PlayerRelationsListener
 {
 public:
@@ -68,7 +67,7 @@ public:
 
     bool removeTab(Party *const party);
 
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
     void showGuildInvite(const std::string &restrict guildName,
                          const int guildId,
@@ -123,7 +122,7 @@ public:
 
     void updatePickupFilter();
 
-    void widgetResized(const gcn::Event &event) override final;
+    void widgetResized(const Event &event) override final;
 
     void setCounter(const SocialTab *const tab, const std::string &str);
 
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 80e86e66f..05172c9b3 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -113,7 +113,7 @@ class DerDisplay final : public AttrDisplay
         { return DERIVED; }
 };
 
-class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
+class ChangeDisplay final : public AttrDisplay, ActionListener
 {
     public:
         ChangeDisplay(const Widget2 *const widget,
@@ -129,7 +129,7 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
 
         void setPointsNeeded(const int needed);
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
     private:
         int mNeeded;
@@ -142,7 +142,7 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
 StatusWindow::StatusWindow() :
     Window(player_node ? player_node->getName() :
         "?", false, nullptr, "status.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     // TRANSLATORS: status window label
     mLvlLabel(new Label(this, strprintf(_("Level: %d"), 0))),
     // TRANSLATORS: status window label
@@ -159,9 +159,9 @@ StatusWindow::StatusWindow() :
     mJobLabel(nullptr),
     mJobBar(nullptr),
     mAttrCont(new VertContainer(this, 32)),
-    mAttrScroll(new ScrollArea(mAttrCont, false)),
+    mAttrScroll(new ScrollArea(this, mAttrCont, false)),
     mDAttrCont(new VertContainer(this, 32)),
-    mDAttrScroll(new ScrollArea(mDAttrCont, false)),
+    mDAttrScroll(new ScrollArea(this, mDAttrCont, false)),
     mCharacterPointsLabel(new Label(this, "C")),
     mCorrectionPointsLabel(nullptr),
     // TRANSLATORS: status window button
@@ -746,7 +746,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar,
         bar->setBackgroundColor(Theme::getThemeColor(Theme::STATUSBAR_OFF));
 }
 
-void StatusWindow::action(const gcn::ActionEvent &event)
+void StatusWindow::action(const ActionEvent &event)
 {
     if (!chatWindow)
         return;
@@ -820,7 +820,7 @@ ChangeDisplay::ChangeDisplay(const Widget2 *const widget,
                              const int id, const std::string &restrict name,
                              const std::string &restrict shortName) :
     AttrDisplay(widget, id, name, shortName),
-    gcn::ActionListener(),
+    ActionListener(),
     mNeeded(1),
     // TRANSLATORS: status window label
     mPoints(new Label(this, _("Max"))),
@@ -873,7 +873,7 @@ void ChangeDisplay::setPointsNeeded(const int needed)
     update();
 }
 
-void ChangeDisplay::action(const gcn::ActionEvent &event)
+void ChangeDisplay::action(const ActionEvent &event)
 {
     if (Net::getPlayerHandler()->canCorrectAttributes() &&
         event.getSource() == mDec)
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index 94f1aaa65..3b171a25e 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -23,11 +23,11 @@
 #ifndef GUI_WINDOWS_STATUSWINDOW_H
 #define GUI_WINDOWS_STATUSWINDOW_H
 
-#include "depricatedlistener.h"
+#include "listeners/depricatedlistener.h"
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <map>
 
@@ -44,7 +44,7 @@ class VertContainer;
  * \ingroup Interface
  */
 class StatusWindow final : public Window,
-                           public gcn::ActionListener,
+                           public ActionListener,
                            public DepricatedListener
 {
     public:
@@ -83,7 +83,7 @@ class StatusWindow final : public Window,
                                       const int id,
                                       const bool percent = true);
 
-        void action(const gcn::ActionEvent &event) override;
+        void action(const ActionEvent &event) override;
 
         void clearAttributes();
 
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 4ae098a3c..dead469bc 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -27,6 +27,10 @@
 
 #include "input/keyboardconfig.h"
 
+#include "gui/models/iconsmodel.h"
+#include "gui/models/magicschoolmodel.h"
+#include "gui/models/targettypemodel.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/inttextfield.h"
@@ -36,131 +40,12 @@
 
 #include "utils/gettext.h"
 
-#include "resources/iteminfo.h"
-
-#include "resources/db/itemdb.h"
-
 #include "debug.h"
 
-class IconsModal final : public gcn::ListModel
-{
-public:
-    IconsModal() :
-        mStrings()
-    {
-        const std::map<int, ItemInfo*> &items = ItemDB::getItemInfos();
-        std::list<std::string> tempStrings;
-
-        for (std::map<int, ItemInfo*>::const_iterator
-             i = items.begin(), i_end = items.end();
-             i != i_end; ++i)
-        {
-            if (i->first < 0)
-                continue;
-
-            const ItemInfo &info = (*i->second);
-            const std::string name = info.getName();
-            if (name != "unnamed" && !info.getName().empty()
-                && info.getName() != "unnamed")
-            {
-                tempStrings.push_back(name);
-            }
-        }
-        tempStrings.sort();
-        mStrings.push_back("");
-        FOR_EACH (std::list<std::string>::const_iterator, i, tempStrings)
-            mStrings.push_back(*i);
-    }
-
-    A_DELETE_COPY(IconsModal)
-
-    ~IconsModal()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return static_cast<int>(mStrings.size());
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i < 0 || i >= getNumberOfElements())
-            return "???";
-        return mStrings.at(i);
-    }
-private:
-    StringVect mStrings;
-};
-
-
-const char *TARGET_TYPE_TEXT[3] =
-{
-    // TRANSLATORS: target type
-    N_("No Target"),
-    // TRANSLATORS: target type
-    N_("Allow Target"),
-    // TRANSLATORS: target type
-    N_("Need Target"),
-};
-
-const char *MAGIC_SCHOOL_TEXT[6] =
-{
-    // TRANSLATORS: magic school
-    N_("General Magic"),
-    // TRANSLATORS: magic school
-    N_("Life Magic"),
-    // TRANSLATORS: magic school
-    N_("War Magic"),
-    // TRANSLATORS: magic school
-    N_("Transmute Magic"),
-    // TRANSLATORS: magic school
-    N_("Nature Magic"),
-    // TRANSLATORS: magic school
-    N_("Astral Magic")
-};
-
-class TargetTypeModel final : public gcn::ListModel
-{
-public:
-    ~TargetTypeModel()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return 3;
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-        return TARGET_TYPE_TEXT[i];
-    }
-};
-
-class MagicSchoolModel final : public gcn::ListModel
-{
-public:
-    ~MagicSchoolModel()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return 6;
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-        return MAGIC_SCHOOL_TEXT[i];
-    }
-};
-
 TextCommandEditor::TextCommandEditor(TextCommand *const command) :
     // TRANSLATORS: command editor name
     Window(_("Command Editor"), false, nullptr, "commandeditor.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mIsMagicCommand(command->getCommandType() == TEXT_COMMAND_MAGIC),
     mCommand(command),
     // TRANSLATORS: command editor button
@@ -180,10 +65,10 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) :
     // TRANSLATORS: command editor label
     mTypeLabel(new Label(this, _("Target Type:"))),
     mTypeDropDown(new DropDown(this, mTargetTypeModel)),
-    mIconsModal(new IconsModal),
+    mIconsModel(new IconsModel),
     // TRANSLATORS: command editor label
     mIconLabel(new Label(this, _("Icon:"))),
-    mIconDropDown(new DropDown(this, mIconsModal)),
+    mIconDropDown(new DropDown(this, mIconsModel)),
     // TRANSLATORS: command editor label
     mManaLabel(new Label(this, _("Mana:"))),
     mManaField(new IntTextField(this, 0)),
@@ -306,15 +191,15 @@ void TextCommandEditor::postInit()
 
 TextCommandEditor::~TextCommandEditor()
 {
-    delete mIconsModal;
-    mIconsModal = nullptr;
+    delete mIconsModel;
+    mIconsModel = nullptr;
     delete mTargetTypeModel;
     mTargetTypeModel = nullptr;
     delete mMagicSchoolModel;
     mMagicSchoolModel = nullptr;
 }
 
-void TextCommandEditor::action(const gcn::ActionEvent &event)
+void TextCommandEditor::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "magic")
diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h
index a31cdbaf2..de7f3b1a4 100644
--- a/src/gui/windows/textcommandeditor.h
+++ b/src/gui/windows/textcommandeditor.h
@@ -25,11 +25,11 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class DropDown;
-class IconsModal;
+class IconsModel;
 class IntTextField;
 class Label;
 class MagicSchoolModel;
@@ -38,7 +38,8 @@ class TargetTypeModel;
 class TextCommand;
 class TextField;
 
-class TextCommandEditor final : public Window, public gcn::ActionListener
+class TextCommandEditor final : public Window,
+                                public ActionListener
 {
     public:
         /**
@@ -55,7 +56,7 @@ class TextCommandEditor final : public Window, public gcn::ActionListener
 
         void postInit() override final;
 
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         void scheduleDelete() override final;
 
@@ -82,7 +83,7 @@ class TextCommandEditor final : public Window, public gcn::ActionListener
         TargetTypeModel *mTargetTypeModel;
         Label *mTypeLabel;
         DropDown *mTypeDropDown;
-        IconsModal *mIconsModal;
+        IconsModel *mIconsModel;
         Label *mIconLabel;
         DropDown *mIconDropDown;
         Label *mManaLabel;
diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp
index 936f08c76..9b7bb3eb1 100644
--- a/src/gui/windows/textdialog.cpp
+++ b/src/gui/windows/textdialog.cpp
@@ -30,7 +30,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "gui/font.h"
 
 #include "debug.h"
 
@@ -41,7 +41,7 @@ TextDialog::TextDialog(const std::string &restrict title,
                        Window *const parent,
                        const bool isPassword):
     Window(title, true, parent, "textdialog.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mTextField(nullptr),
     mPasswordField(nullptr),
     // TRANSLATORS: text dialog button
@@ -68,7 +68,7 @@ TextDialog::TextDialog(const std::string &restrict title,
     place(2, 2, mOkButton);
     place(3, 2, cancelButton);
 
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     if (font)
     {
         int width = font->getWidth(title);
@@ -104,7 +104,7 @@ TextDialog::~TextDialog()
     instances--;
 }
 
-void TextDialog::action(const gcn::ActionEvent &event)
+void TextDialog::action(const ActionEvent &event)
 {
     if (event.getId() == "CANCEL")
         setActionEventId("~" + getActionEventId());
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index 9bfb4ae5f..8e69e8a3d 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class PasswordField;
@@ -36,7 +36,8 @@ class TextField;
  *
  * \ingroup GUI
  */
-class TextDialog final : public Window, public gcn::ActionListener
+class TextDialog final : public Window,
+                         public ActionListener
 {
 public:
     /**
@@ -58,7 +59,7 @@ public:
     /**
      * Called when receiving actions from the widgets.
      */
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
     /**
      * Get the text in the textfield
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index a379f0f28..506f25c17 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -31,7 +31,8 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/itemamountwindow.h"
@@ -51,8 +52,6 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 // TRANSLATORS: trade window button
@@ -67,8 +66,8 @@
 TradeWindow::TradeWindow():
     // TRANSLATORS: trade window caption
     Window(_("Trade: You"), false, nullptr, "trade.xml"),
-    gcn::ActionListener(),
-    gcn::SelectionListener(),
+    ActionListener(),
+    SelectionListener(),
     mMyInventory(new Inventory(Inventory::TRADE)),
     mPartnerInventory(new Inventory(Inventory::TRADE)),
     mMyItemContainer(new ItemContainer(this, mMyInventory.get())),
@@ -102,7 +101,7 @@ TradeWindow::TradeWindow():
     if (setupWindow)
         setupWindow->registerWindowForReset(this);
 
-    const gcn::Font *const fnt = mOkButton->getFont();
+    const Font *const fnt = mOkButton->getFont();
     int width = std::max(fnt->getWidth(CAPTION_PROPOSE),
         fnt->getWidth(CAPTION_CONFIRMED));
     width = std::max(width, fnt->getWidth(CAPTION_ACCEPT));
@@ -112,13 +111,14 @@ TradeWindow::TradeWindow():
 
     mMyItemContainer->addSelectionListener(this);
 
-    ScrollArea *const myScroll = new ScrollArea(mMyItemContainer,
+    ScrollArea *const myScroll = new ScrollArea(this, mMyItemContainer,
         true, "trade_background.xml");
     myScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mPartnerItemContainer->addSelectionListener(this);
 
-    ScrollArea *const partnerScroll = new ScrollArea(mPartnerItemContainer,
+    ScrollArea *const partnerScroll = new ScrollArea(this,
+        mPartnerItemContainer,
         true, "trade_background.xml");
     partnerScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
@@ -130,8 +130,7 @@ TradeWindow::TradeWindow():
     place(1, 0, mMoneyLabel);
     place(0, 1, myScroll).setPadding(3);
     place(1, 1, partnerScroll).setPadding(3);
-    ContainerPlacer placer;
-    placer = getPlacer(0, 0);
+    ContainerPlacer placer = getPlacer(0, 0);
     placer(0, 0, moneyLabel2);
     placer(1, 0, mMoneyField, 2);
     placer(3, 0, mMoneyChangeButton).setHAlign(LayoutCell::LEFT);
@@ -268,7 +267,7 @@ void TradeWindow::tradeItem(const Item *const item, const int quantity,
     Net::getTradeHandler()->addItem(item, quantity);
 }
 
-void TradeWindow::valueChanged(const gcn::SelectionEvent &event)
+void TradeWindow::valueChanged(const SelectionEvent &event)
 {
     if (!mMyItemContainer || !mPartnerItemContainer)
         return;
@@ -318,7 +317,7 @@ void TradeWindow::setStatus(const Status s)
     mOkButton->setEnabled((s != PROPOSING && s != ACCEPTED));
 }
 
-void TradeWindow::action(const gcn::ActionEvent &event)
+void TradeWindow::action(const ActionEvent &event)
 {
     if (!inventoryWindow)
         return;
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index ac49c1f52..9704c1e80 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/selectionlistener.h"
 
 #include <memory>
 
@@ -43,8 +43,8 @@ class TextField;
  * \ingroup Interface
  */
 class TradeWindow final : public Window,
-                          private gcn::ActionListener,
-                          private gcn::SelectionListener
+                          private ActionListener,
+                          private SelectionListener
 {
     public:
         /**
@@ -109,12 +109,12 @@ class TradeWindow final : public Window,
          * Updates the labels and makes sure only one item is selected in
          * either my inventory or partner inventory.
          */
-        void valueChanged(const gcn::SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) override final;
 
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
         /**
          * Closes the Trade Window, as well as telling the server that the
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index 76afb1539..3326ca2bb 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -45,7 +45,7 @@
 UnRegisterDialog::UnRegisterDialog(LoginData *const data) :
     // TRANSLATORS: unregister dialog name
     Window(_("Unregister"), true, nullptr, "unregister.xml"),
-    gcn::ActionListener(),
+    ActionListener(),
     mLoginData(data),
     mPasswordField(new PasswordField(this, mLoginData->password)),
     // TRANSLATORS: unregister dialog. button.
@@ -101,7 +101,7 @@ UnRegisterDialog::~UnRegisterDialog()
     mWrongDataNoticeListener = nullptr;
 }
 
-void UnRegisterDialog::action(const gcn::ActionEvent &event)
+void UnRegisterDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "cancel")
diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h
index fd40810ac..206c05413 100644
--- a/src/gui/windows/unregisterdialog.h
+++ b/src/gui/windows/unregisterdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class Button;
 class LoginData;
@@ -37,7 +37,8 @@ class WrongDataNoticeListener;
  *
  * \ingroup Interface
  */
-class UnRegisterDialog final : public Window, public gcn::ActionListener
+class UnRegisterDialog final : public Window,
+                               public ActionListener
 {
     public:
         /**
@@ -56,7 +57,7 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
     private:
         LoginData *mLoginData;
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index eab1bea1b..e72308da7 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -25,8 +25,9 @@
 #include "client.h"
 #include "configuration.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
@@ -156,8 +157,8 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
                              const int updateType):
     // TRANSLATORS: updater window name
     Window(_("Updating..."), false, nullptr, "update.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mDownloadStatus(UPDATE_NEWS),
     mUpdateHost(updateHost),
     mUpdatesDir(updatesDir),
@@ -189,7 +190,8 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
                  "updateprogressbar.xml", "updateprogressbar_fill.xml")),
     mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
         "browserbox.xml")),
-    mScrollArea(new ScrollArea(mBrowserBox, true, "update_background.xml")),
+    mScrollArea(new ScrollArea(this, mBrowserBox,
+        true, "update_background.xml")),
     mUpdateServerPath(mUpdateHost)
 {
     setWindowName("UpdaterWindow");
@@ -270,7 +272,7 @@ void UpdaterWindow::enable()
         client->setState(STATE_LOAD_DATA);
 }
 
-void UpdaterWindow::action(const gcn::ActionEvent &event)
+void UpdaterWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "cancel")
@@ -290,12 +292,12 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
     }
 }
 
-void UpdaterWindow::keyPressed(gcn::KeyEvent &keyEvent)
+void UpdaterWindow::keyPressed(KeyEvent &keyEvent)
 {
-    const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
     if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
     {
-        action(gcn::ActionEvent(nullptr, mCancelButton->getActionEventId()));
+        action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
         client->setState(STATE_LOGIN);
     }
     else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
@@ -304,12 +306,11 @@ void UpdaterWindow::keyPressed(gcn::KeyEvent &keyEvent)
         if (mDownloadStatus == UPDATE_COMPLETE ||
             mDownloadStatus == UPDATE_ERROR)
         {
-            action(gcn::ActionEvent(nullptr, mPlayButton->getActionEventId()));
+            action(ActionEvent(nullptr, mPlayButton->getActionEventId()));
         }
         else
         {
-            action(gcn::ActionEvent(nullptr,
-                mCancelButton->getActionEventId()));
+            action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
         }
     }
 }
@@ -971,7 +972,7 @@ unsigned long UpdaterWindow::getFileHash(const std::string &filePath)
 }
 
 void UpdaterWindow::handleLink(const std::string &link,
-                               gcn::MouseEvent *event A_UNUSED)
+                               MouseEvent *event A_UNUSED)
 {
     if (strStartWith(link, "http://") || strStartWith(link, "https://"))
         openBrowser(link);
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index bddd3ef9e..79d764752 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -30,8 +30,8 @@
 
 #include "utils/mutex.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 #include <string>
 #include <vector>
@@ -69,9 +69,9 @@ struct UpdateFile final
  * \ingroup GUI
  */
 class UpdaterWindow final : public Window,
-                            public gcn::ActionListener,
+                            public ActionListener,
                             public LinkHandler,
-                            public gcn::KeyListener
+                            public KeyListener
 {
  public:
     /**
@@ -119,14 +119,14 @@ class UpdaterWindow final : public Window,
 
     void loadPatch();
 
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
-    void keyPressed(gcn::KeyEvent &keyEvent) override final;
+    void keyPressed(KeyEvent &keyEvent) override final;
 
     void logic() override final;
 
     void handleLink(const std::string &link,
-                    gcn::MouseEvent *event A_UNUSED) override final;
+                    MouseEvent *event A_UNUSED) override final;
 
     void loadFile(std::string file);
 
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index fd54076ed..dabc8c7c1 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -87,7 +87,7 @@ WhoIsOnline::WhoIsOnline() :
     mCurlError(new char[CURL_ERROR_SIZE]),
     mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
         "onlinebrowserbox.xml")),
-    mScrollArea(new ScrollArea(mBrowserBox, false)),
+    mScrollArea(new ScrollArea(this, mBrowserBox, false)),
     mUpdateTimer(0),
     mOnlinePlayers(),
     mOnlineNicks(),
@@ -116,10 +116,10 @@ void WhoIsOnline::postInit()
     setSaveVisible(true);
 
     mUpdateButton->setEnabled(false);
-    mUpdateButton->setDimension(gcn::Rectangle(5, 5, w - 10, 20 + 5));
+    mUpdateButton->setDimension(Rect(5, 5, w - 10, 20 + 5));
 
     mBrowserBox->setOpaque(false);
-    mScrollArea->setDimension(gcn::Rectangle(5, 20 + 10, w - 10, h - 10 - 30));
+    mScrollArea->setDimension(Rect(5, 20 + 10, w - 10, h - 10 - 30));
     mScrollArea->setSize(w - 10, h - 10 - 30);
     mBrowserBox->setLinkHandler(this);
 
@@ -133,7 +133,7 @@ void WhoIsOnline::postInit()
 
     download();
 
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
     config.addListener("updateOnlineList", this);
     config.addListener("groupFriends", this);
     mGroupFriends = config.getBoolValue("groupFriends");
@@ -159,9 +159,9 @@ WhoIsOnline::~WhoIsOnline()
     mOnlineNicks.clear();
 }
 
-void WhoIsOnline::handleLink(const std::string& link, gcn::MouseEvent *event)
+void WhoIsOnline::handleLink(const std::string& link, MouseEvent *event)
 {
-    if (!event || event->getButton() == gcn::MouseEvent::LEFT)
+    if (!event || event->getButton() == MouseEvent::LEFT)
     {
         if (chatWindow)
         {
@@ -177,7 +177,7 @@ void WhoIsOnline::handleLink(const std::string& link, gcn::MouseEvent *event)
             }
         }
     }
-    else if (event->getButton() == gcn::MouseEvent::RIGHT)
+    else if (event->getButton() == MouseEvent::RIGHT)
     {
         if (player_node && link == player_node->getName())
             return;
@@ -683,7 +683,7 @@ void WhoIsOnline::slowLogic()
     BLOCK_END("WhoIsOnline::slowLogic")
 }
 
-void WhoIsOnline::action(const gcn::ActionEvent &event)
+void WhoIsOnline::action(const ActionEvent &event)
 {
     if (event.getId() == "update")
     {
@@ -715,7 +715,7 @@ void WhoIsOnline::action(const gcn::ActionEvent &event)
     }
 }
 
-void WhoIsOnline::widgetResized(const gcn::Event &event)
+void WhoIsOnline::widgetResized(const Event &event)
 {
     Window::widgetResized(event);
     updateSize();
@@ -723,7 +723,7 @@ void WhoIsOnline::widgetResized(const gcn::Event &event)
 
 void WhoIsOnline::updateSize()
 {
-    const gcn::Rectangle area = getChildrenArea();
+    const Rect area = getChildrenArea();
     if (mUpdateButton)
         mUpdateButton->setWidth(area.width - 10);
 
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 10a8be4b5..bc04c8066 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -23,14 +23,14 @@
 #ifndef GUI_WINDOWS_WHOISONLINE_H
 #define GUI_WINDOWS_WHOISONLINE_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
 #include <set>
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 class BrowserBox;
 class Button;
@@ -102,7 +102,7 @@ class OnlinePlayer final
  */
 class WhoIsOnline final : public Window,
                           public LinkHandler,
-                          public gcn::ActionListener,
+                          public ActionListener,
                           public ConfigListener
 {
 public:
@@ -128,15 +128,15 @@ public:
     void loadList(std::vector<OnlinePlayer*> &list);
 
     void handleLink(const std::string& link,
-                    gcn::MouseEvent *event) override final;
+                    MouseEvent *event) override final;
 
     void logic() override final;
 
     void slowLogic();
 
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
-    void widgetResized(const gcn::Event &event) override final;
+    void widgetResized(const Event &event) override final;
 
     const std::set<OnlinePlayer*> &getOnlinePlayers() const A_WARN_UNUSED
     { return mOnlinePlayers; }
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index a3fd0fc73..77d167c82 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -24,14 +24,17 @@
 
 #include "client.h"
 
+#include "events/keyevent.h"
+
 #include "input/keydata.h"
-#include "input/keyevent.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "gui/models/worldlistmodel.h"
+
 #include "net/loginhandler.h"
 #include "net/net.h"
 
@@ -41,49 +44,11 @@
 
 extern WorldInfo **server_info;
 
-/**
- * The list model for the server list.
- */
-class WorldListModel final : public gcn::ListModel
-{
-    public:
-        explicit WorldListModel(Worlds worlds) :
-            mWorlds(worlds)
-        {
-        }
-
-        A_DELETE_COPY(WorldListModel)
-
-        ~WorldListModel()
-        { }
-
-        int getNumberOfElements() override final
-        {
-            return static_cast<int>(mWorlds.size());
-        }
-
-        std::string getElementAt(int i) override final
-        {
-            const WorldInfo *const si = mWorlds[i];
-            if (si)
-            {
-                return std::string(si->name).append(" (").append(
-                    toString(si->online_users)).append(")");
-            }
-            else
-            {
-                return "???";
-            }
-        }
-    private:
-        Worlds mWorlds;
-};
-
 WorldSelectDialog::WorldSelectDialog(Worlds worlds):
     // TRANSLATORS: world select dialog name
     Window(_("Select World"), false, nullptr, "world.xml"),
-    gcn::ActionListener(),
-    gcn::KeyListener(),
+    ActionListener(),
+    KeyListener(),
     mWorldListModel(new WorldListModel(worlds)),
     mWorldList(new ListBox(this, mWorldListModel, "")),
     // TRANSLATORS: world dialog button
@@ -92,7 +57,7 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds):
     mChooseWorld(new Button(this, _("Choose World"), "world", this))
 {
     mWorldList->postInit();
-    ScrollArea *const worldsScroll = new ScrollArea(mWorldList,
+    ScrollArea *const worldsScroll = new ScrollArea(this, mWorldList,
         getOptionBool("showbackground"), "world_background.xml");
 
     worldsScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -134,7 +99,7 @@ WorldSelectDialog::~WorldSelectDialog()
     mWorldListModel = nullptr;
 }
 
-void WorldSelectDialog::action(const gcn::ActionEvent &event)
+void WorldSelectDialog::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "world")
@@ -153,19 +118,18 @@ void WorldSelectDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void WorldSelectDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void WorldSelectDialog::keyPressed(KeyEvent &keyEvent)
 {
-    const int actionId = static_cast<KeyEvent*>(
-        &keyEvent)->getActionId();
+    const int actionId = keyEvent.getActionId();
 
     if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
     {
-        action(gcn::ActionEvent(nullptr,
+        action(ActionEvent(nullptr,
             mChangeLoginButton->getActionEventId()));
     }
     else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
              || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
     {
-        action(gcn::ActionEvent(nullptr, mChooseWorld->getActionEventId()));
+        action(ActionEvent(nullptr, mChooseWorld->getActionEventId()));
     }
 }
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index f7491689b..9d06ac25e 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -27,8 +27,8 @@
 
 #include "net/worldinfo.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "listeners/actionlistener.h"
+#include "listeners/keylistener.h"
 
 class Button;
 class ListBox;
@@ -39,8 +39,9 @@ class WorldListModel;
  *
  * \ingroup Interface
  */
-class WorldSelectDialog final : public Window, public gcn::ActionListener,
-                                public gcn::KeyListener
+class WorldSelectDialog final : public Window,
+                                public ActionListener,
+                                public KeyListener
 {
     public:
         /**
@@ -62,9 +63,9 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 
-        void keyPressed(gcn::KeyEvent &keyEvent) override final;
+        void keyPressed(KeyEvent &keyEvent) override final;
 
     private:
         WorldListModel *mWorldListModel;
diff --git a/src/guichan/actionevent.cpp b/src/guichan/actionevent.cpp
deleted file mode 100644
index 2a31bfc8b..000000000
--- a/src/guichan/actionevent.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/actionevent.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    ActionEvent::ActionEvent(Widget *const source, const std::string &id)
-            :Event(source),
-             mId(id)
-    {
-    }
-
-    ActionEvent::~ActionEvent()
-    {
-    }
-
-    const std::string& ActionEvent::getId() const
-    {
-        return mId;
-    }
-}  // namespace gcn
diff --git a/src/guichan/cliprectangle.cpp b/src/guichan/cliprectangle.cpp
deleted file mode 100644
index c09990087..000000000
--- a/src/guichan/cliprectangle.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/cliprectangle.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    ClipRectangle::ClipRectangle() :
-        Rectangle(),
-        xOffset(0),
-        yOffset(0)
-    {
-        x = 0;
-        y = 0;
-        width = 0;
-        height = 0;
-    }
-
-    ClipRectangle::ClipRectangle(const int x0, const int y0,
-                                 const int width0, const int height0,
-                                 const int xOffset0, const int yOffset0) :
-        Rectangle(),
-        xOffset(xOffset0),
-        yOffset(yOffset0)
-    {
-        x = x0;
-        y = y0;
-        width = width0;
-        height = height0;
-    }
-
-    const ClipRectangle& ClipRectangle::operator=(const Rectangle& other)
-    {
-        x = other.x;
-        y = other.y;
-        width = other.width;
-        height = other.height;
-
-        return *this;
-    }
-}  // namespace gcn
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp
deleted file mode 100644
index 27612876f..000000000
--- a/src/guichan/color.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/color.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    Color::Color() :
-        r(0),
-        g(0),
-        b(0),
-        a(255)
-    {
-    }
-
-    Color::Color(const int color) :
-        r((color >> 16) & 0xFF),
-        g((color >>  8) & 0xFF),
-        b(color         & 0xFF),
-        a(255)
-    {
-    }
-
-    Color::Color(const int ar, const int ag, const int ab, const int aa) :
-        r(ar),
-        g(ag),
-        b(ab),
-        a(aa)
-    {
-    }
-
-    Color Color::operator+(const Color& color) const
-    {
-        Color result(r + color.r,
-                     g + color.g,
-                     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));
-
-        return result;
-    }
-
-    Color Color::operator-(const Color& color) const
-    {
-        Color result(r - color.r,
-                     g - color.g,
-                     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));
-
-        return result;
-    }
-
-    Color Color::operator*(const float value) const
-    {
-        Color result(static_cast<int>(static_cast<float>(r) * value),
-                     static_cast<int>(static_cast<float>(g) * value),
-                     static_cast<int>(static_cast<float>(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));
-
-        return result;
-    }
-
-    bool Color::operator==(const Color& color) const
-    {
-        return r == color.r && g == color.g && b == color.b && a == color.a;
-    }
-
-    bool Color::operator!=(const Color& color) const
-    {
-        return !(r == color.r && g == color.g && b == color.b && a == color.a);
-    }
-
-    std::ostream& operator<<(std::ostream& out,
-                             const Color& color)
-    {
-        out << "Color [r = "
-            << color.r
-            << ", g = "
-            << color.g
-            << ", b = "
-            << color.b
-            << ", a = "
-            << color.a
-            << "]";
-
-        return out;
-    }
-}  // namespace gcn
diff --git a/src/guichan/event.cpp b/src/guichan/event.cpp
deleted file mode 100644
index f4a03bc19..000000000
--- a/src/guichan/event.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/event.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    Event::Event(Widget *const source) :
-        mSource(source)
-    {
-    }
-
-    Event::~Event()
-    {
-    }
-
-    Widget* Event::getSource() const
-    {
-        return mSource;
-    }
-}  // namespace gcn
diff --git a/src/guichan/exception.cpp b/src/guichan/exception.cpp
deleted file mode 100644
index b02df93eb..000000000
--- a/src/guichan/exception.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/exception.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    Exception::Exception()
-        : mFunction("?"),
-          mMessage(""),
-          mFilename("?"),
-          mLine(0)
-    {
-    }
-
-    Exception::Exception(const std::string& message)
-        : mFunction("?"),
-          mMessage(message),
-          mFilename("?"),
-          mLine(0)
-    {
-    }
-
-    Exception::Exception(const std::string& message,
-                         const std::string& function,
-                         const std::string& filename,
-                         const unsigned int line)
-                         : mFunction(function),
-                           mMessage(message),
-                           mFilename(filename),
-                           mLine(line)
-    {
-    }
-
-    const std::string& Exception::getFunction() const
-    {
-        return mFunction;
-    }
-
-    const std::string& Exception::getMessage() const
-    {
-        return mMessage;
-    }
-
-    const std::string& Exception::getFilename() const
-    {
-        return mFilename;
-    }
-
-    unsigned int Exception::getLine() const
-    {
-        return mLine;
-    }
-}  // namespace gcn
diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp
deleted file mode 100644
index 3249703a3..000000000
--- a/src/guichan/focushandler.cpp
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/focushandler.hpp"
-
-#include "guichan/focuslistener.hpp"
-#include "guichan/exception.hpp"
-#include "guichan/widget.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    FocusHandler::FocusHandler() :
-        mWidgets(),
-        mFocusedWidget(nullptr),
-        mModalFocusedWidget(nullptr),
-        mModalMouseInputFocusedWidget(nullptr),
-        mDraggedWidget(nullptr),
-        mLastWidgetWithMouse(nullptr),
-        mLastWidgetWithModalFocus(nullptr),
-        mLastWidgetWithModalMouseInputFocus(nullptr),
-        mLastWidgetPressed(nullptr)
-    {
-    }
-
-    void FocusHandler::requestFocus(Widget* widget)
-    {
-        if (!widget || widget == mFocusedWidget)
-            return;
-
-        int toBeFocusedIndex = -1;
-        for (unsigned int i = 0, sz = static_cast<unsigned int>(
-             mWidgets.size()); i < sz; ++i)
-        {
-            if (mWidgets[i] == widget)
-            {
-                toBeFocusedIndex = i;
-                break;
-            }
-        }
-
-        if (toBeFocusedIndex < 0)
-            throw GCN_EXCEPTION("Trying to focus a none existing widget.");
-
-        Widget *const oldFocused = mFocusedWidget;
-
-        if (oldFocused != widget)
-        {
-            mFocusedWidget = mWidgets.at(toBeFocusedIndex);
-
-            if (oldFocused)
-            {
-                Event focusEvent(oldFocused);
-                distributeFocusLostEvent(focusEvent);
-            }
-
-            Event focusEvent(mWidgets.at(toBeFocusedIndex));
-            distributeFocusGainedEvent(focusEvent);
-        }
-    }
-
-    void FocusHandler::requestModalFocus(Widget* widget)
-    {
-        if (mModalFocusedWidget && mModalFocusedWidget != widget)
-            throw GCN_EXCEPTION("Another widget already has modal focus.");
-
-        mModalFocusedWidget = widget;
-
-        if (mFocusedWidget && !mFocusedWidget->isModalFocused())
-            focusNone();
-    }
-
-    void FocusHandler::requestModalMouseInputFocus(Widget* widget)
-    {
-        if (mModalMouseInputFocusedWidget
-            && mModalMouseInputFocusedWidget != widget)
-        {
-            throw GCN_EXCEPTION("Another widget already has "
-                "modal input focus.");
-        }
-
-        mModalMouseInputFocusedWidget = widget;
-    }
-
-    void FocusHandler::releaseModalFocus(Widget* widget)
-    {
-        if (mModalFocusedWidget == widget)
-            mModalFocusedWidget = nullptr;
-    }
-
-    void FocusHandler::releaseModalMouseInputFocus(Widget* widget)
-    {
-        if (mModalMouseInputFocusedWidget == widget)
-            mModalMouseInputFocusedWidget = nullptr;
-    }
-
-    Widget* FocusHandler::getFocused() const
-    {
-        return mFocusedWidget;
-    }
-
-    Widget* FocusHandler::getModalFocused() const
-    {
-        return mModalFocusedWidget;
-    }
-
-    Widget* FocusHandler::getModalMouseInputFocused() const
-    {
-        return mModalMouseInputFocusedWidget;
-    }
-
-    void FocusHandler::focusNext()
-    {
-        int i;
-        int focusedWidget = -1;
-        const int sz = static_cast<int>(mWidgets.size());
-        for (i = 0; i < sz; ++i)
-        {
-            if (mWidgets[i] == mFocusedWidget)
-                focusedWidget = i;
-        }
-        const int focused = focusedWidget;
-
-        // i is a counter that ensures that the following loop
-        // won't get stuck in an infinite loop
-        i = sz;
-        do
-        {
-            ++ focusedWidget;
-
-            if (i == 0)
-            {
-                focusedWidget = -1;
-                break;
-            }
-
-            -- i;
-
-            if (focusedWidget >= sz)
-                focusedWidget = 0;
-
-            if (focusedWidget == focused)
-                return;
-        }
-        while (!mWidgets.at(focusedWidget)->isFocusable());
-
-        if (focusedWidget >= 0)
-        {
-            mFocusedWidget = mWidgets.at(focusedWidget);
-
-            Event focusEvent(mFocusedWidget);
-            distributeFocusGainedEvent(focusEvent);
-        }
-
-        if (focused >= 0)
-        {
-            Event focusEvent(mWidgets.at(focused));
-            distributeFocusLostEvent(focusEvent);
-        }
-    }
-
-    void FocusHandler::focusPrevious()
-    {
-        if (mWidgets.empty())
-        {
-            mFocusedWidget = nullptr;
-            return;
-        }
-
-        int i;
-        int focusedWidget = -1;
-        const int sz = static_cast<int>(mWidgets.size());
-        for (i = 0; i < sz; ++ i)
-        {
-            if (mWidgets[i] == mFocusedWidget)
-                focusedWidget = i;
-        }
-        const int focused = focusedWidget;
-
-        // i is a counter that ensures that the following loop
-        // won't get stuck in an infinite loop
-        i = sz;
-        do
-        {
-            -- focusedWidget;
-
-            if (i == 0)
-            {
-                focusedWidget = -1;
-                break;
-            }
-
-            -- i;
-
-            if (focusedWidget <= 0)
-                focusedWidget = sz - 1;
-
-            if (focusedWidget == focused)
-                return;
-        }
-        while (!mWidgets.at(focusedWidget)->isFocusable());
-
-        if (focusedWidget >= 0)
-        {
-            mFocusedWidget = mWidgets.at(focusedWidget);
-            Event focusEvent(mFocusedWidget);
-            distributeFocusGainedEvent(focusEvent);
-        }
-
-        if (focused >= 0)
-        {
-            Event focusEvent(mWidgets.at(focused));
-            distributeFocusLostEvent(focusEvent);
-        }
-    }
-
-    bool FocusHandler::isFocused(const Widget* widget) const
-    {
-        return mFocusedWidget == widget;
-    }
-
-    void FocusHandler::add(Widget* widget)
-    {
-        mWidgets.push_back(widget);
-    }
-
-    void FocusHandler::remove(Widget* widget)
-    {
-        if (isFocused(widget))
-            mFocusedWidget = nullptr;
-
-        for (WidgetIterator iter = mWidgets.begin();
-             iter != mWidgets.end(); ++iter)
-        {
-            if ((*iter) == widget)
-            {
-                mWidgets.erase(iter);
-                break;
-            }
-        }
-
-        if (mDraggedWidget == widget)
-        {
-            mDraggedWidget = nullptr;
-            return;
-        }
-
-        if (mLastWidgetWithMouse == widget)
-        {
-            mLastWidgetWithMouse = nullptr;
-            return;
-        }
-
-        if (mLastWidgetWithModalFocus == widget)
-        {
-            mLastWidgetWithModalFocus = nullptr;
-            return;
-        }
-
-        if (mLastWidgetWithModalMouseInputFocus == widget)
-        {
-            mLastWidgetWithModalMouseInputFocus = nullptr;
-            return;
-        }
-
-        if (mLastWidgetPressed == widget)
-        {
-            mLastWidgetPressed = nullptr;
-            return;
-        }
-    }
-
-    void FocusHandler::focusNone()
-    {
-        if (mFocusedWidget)
-        {
-            Widget *const focused = mFocusedWidget;
-            mFocusedWidget = nullptr;
-
-            Event focusEvent(focused);
-            distributeFocusLostEvent(focusEvent);
-        }
-    }
-
-    void FocusHandler::tabNext()
-    {
-        if (mFocusedWidget)
-        {
-            if (!mFocusedWidget->isTabOutEnabled())
-                return;
-        }
-
-        if (mWidgets.empty())
-        {
-            mFocusedWidget = nullptr;
-            return;
-        }
-
-        int i;
-        int focusedWidget = -1;
-        const int sz = static_cast<int>(mWidgets.size());
-        for (i = 0; i < sz; ++ i)
-        {
-            if (mWidgets[i] == mFocusedWidget)
-                focusedWidget = i;
-        }
-        const int focused = focusedWidget;
-        bool done = false;
-
-        // i is a counter that ensures that the following loop
-        // won't get stuck in an infinite loop
-        i = sz;
-        do
-        {
-            ++ focusedWidget;
-
-            if (i == 0)
-            {
-                focusedWidget = -1;
-                break;
-            }
-
-            -- i;
-
-            if (focusedWidget >= sz)
-                focusedWidget = 0;
-
-            if (focusedWidget == focused)
-                return;
-
-            const Widget *const widget = mWidgets.at(focusedWidget);
-            if (widget->isFocusable() && widget->isTabInEnabled() &&
-                (!mModalFocusedWidget || widget->isModalFocused()))
-            {
-                done = true;
-            }
-        }
-        while (!done);
-
-        if (focusedWidget >= 0)
-        {
-            mFocusedWidget = mWidgets.at(focusedWidget);
-            Event focusEvent(mFocusedWidget);
-            distributeFocusGainedEvent(focusEvent);
-        }
-
-        if (focused >= 0)
-        {
-            Event focusEvent(mWidgets.at(focused));
-            distributeFocusLostEvent(focusEvent);
-        }
-    }
-
-    void FocusHandler::tabPrevious()
-    {
-        if (mFocusedWidget)
-        {
-            if (!mFocusedWidget->isTabOutEnabled())
-                return;
-        }
-
-        if (mWidgets.empty())
-        {
-            mFocusedWidget = nullptr;
-            return;
-        }
-
-        int i;
-        int focusedWidget = -1;
-        const int sz = static_cast<int>(mWidgets.size());
-        for (i = 0; i < sz; ++ i)
-        {
-            if (mWidgets[i] == mFocusedWidget)
-                focusedWidget = i;
-        }
-        const int focused = focusedWidget;
-        bool done = false;
-
-        // i is a counter that ensures that the following loop
-        // won't get stuck in an infinite loop
-        i = sz;
-        do
-        {
-            -- focusedWidget;
-
-            if (i == 0)
-            {
-                focusedWidget = -1;
-                break;
-            }
-
-            -- i;
-
-            if (focusedWidget <= 0)
-                focusedWidget = sz - 1;
-
-            if (focusedWidget == focused)
-                return;
-
-            const Widget *const widget = mWidgets.at(focusedWidget);
-            if (widget->isFocusable() && widget->isTabInEnabled() &&
-                (!mModalFocusedWidget || widget->isModalFocused()))
-            {
-                done = true;
-            }
-        }
-        while (!done);
-
-        if (focusedWidget >= 0)
-        {
-            mFocusedWidget = mWidgets.at(focusedWidget);
-            Event focusEvent(mFocusedWidget);
-            distributeFocusGainedEvent(focusEvent);
-        }
-
-        if (focused >= 0)
-        {
-            Event focusEvent(mWidgets.at(focused));
-            distributeFocusLostEvent(focusEvent);
-        }
-    }
-
-    void FocusHandler::distributeFocusLostEvent(const Event& focusEvent)
-    {
-        Widget *const sourceWidget = focusEvent.getSource();
-
-        std::list<FocusListener*> focusListeners
-            = sourceWidget->_getFocusListeners();
-
-        // Send the event to all focus listeners of the widget.
-        for (std::list<FocusListener*>::const_iterator
-             it = focusListeners.begin();
-             it != focusListeners.end();
-             ++ it)
-        {
-            (*it)->focusLost(focusEvent);
-        }
-    }
-
-    void FocusHandler::distributeFocusGainedEvent(const Event& focusEvent)
-    {
-        Widget *const sourceWidget = focusEvent.getSource();
-
-        std::list<FocusListener*> focusListeners
-            = sourceWidget->_getFocusListeners();
-
-        // Send the event to all focus listeners of the widget.
-        for (std::list<FocusListener*>::const_iterator
-             it = focusListeners.begin();
-             it != focusListeners.end();
-             ++ it)
-        {
-            (*it)->focusGained(focusEvent);
-        }
-    }
-
-    Widget* FocusHandler::getDraggedWidget()
-    {
-        return mDraggedWidget;
-    }
-
-    void FocusHandler::setDraggedWidget(Widget* draggedWidget)
-    {
-        mDraggedWidget = draggedWidget;
-    }
-
-    Widget* FocusHandler::getLastWidgetWithMouse()
-    {
-        return mLastWidgetWithMouse;
-    }
-
-    void FocusHandler::setLastWidgetWithMouse(Widget* lastWidgetWithMouse)
-    {
-        mLastWidgetWithMouse = lastWidgetWithMouse;
-    }
-
-    Widget* FocusHandler::getLastWidgetWithModalFocus()
-    {
-        return mLastWidgetWithModalFocus;
-    }
-
-    void FocusHandler::setLastWidgetWithModalFocus(Widget* widget)
-    {
-        mLastWidgetWithModalFocus = widget;
-    }
-
-    Widget* FocusHandler::getLastWidgetWithModalMouseInputFocus()
-    {
-        return mLastWidgetWithModalMouseInputFocus;
-    }
-
-    void FocusHandler::setLastWidgetWithModalMouseInputFocus(Widget* widget)
-    {
-        mLastWidgetWithModalMouseInputFocus = widget;
-    }
-
-    Widget* FocusHandler::getLastWidgetPressed()
-    {
-        return mLastWidgetPressed;
-    }
-
-    void FocusHandler::setLastWidgetPressed(Widget* lastWidgetPressed)
-    {
-        mLastWidgetPressed = lastWidgetPressed;
-    }
-}  // namespace gcn
diff --git a/src/guichan/font.cpp b/src/guichan/font.cpp
deleted file mode 100644
index 982e1ac8c..000000000
--- a/src/guichan/font.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/font.hpp"
-
-#include <string>
-
-#include "debug.h"
-
-namespace gcn
-{
-    int Font::getStringIndexAt(const std::string& text, const int x) const
-    {
-        const size_t sz = text.size();
-        for (size_t i = 0; i < sz; ++i)
-        {
-            if (getWidth(text.substr(0, i)) > x)
-                return i;
-        }
-
-        return static_cast<int>(sz);
-    }
-}  // namespace gcn
diff --git a/src/guichan/graphics.cpp b/src/guichan/graphics.cpp
deleted file mode 100644
index b63c4b58c..000000000
--- a/src/guichan/graphics.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/graphics.hpp"
-
-#include "guichan/exception.hpp"
-#include "guichan/font.hpp"
-#include "guichan/image.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-
-    Graphics::Graphics() :
-        mClipStack(),
-        mFont(nullptr)
-    {
-    }
-
-    bool Graphics::pushClipArea(Rectangle area)
-    {
-        // Ignore area with a negate width or height
-        // by simple pushing an empty clip area
-        // to the stack.
-        if (area.width < 0 || area.height < 0)
-        {
-            ClipRectangle carea;
-            mClipStack.push(carea);
-            return true;
-        }
-
-        if (mClipStack.empty())
-        {
-            ClipRectangle carea;
-            carea.x = area.x;
-            carea.y = area.y;
-            carea.width = area.width;
-            carea.height = area.height;
-            carea.xOffset = area.x;
-            carea.yOffset = area.y;
-            mClipStack.push(carea);
-            return true;
-        }
-
-        const ClipRectangle &top = mClipStack.top();
-        ClipRectangle carea;
-        carea = area;
-        carea.xOffset = top.xOffset + carea.x;
-        carea.yOffset = top.yOffset + carea.y;
-        carea.x += top.xOffset;
-        carea.y += top.yOffset;
-
-        // Clamp the pushed clip rectangle.
-        if (carea.x < top.x)
-            carea.x = top.x;
-
-        if (carea.y < top.y)
-            carea.y = top.y;
-
-        if (carea.x + carea.width > top.x + top.width)
-        {
-            carea.width = top.x + top.width - carea.x;
-
-            if (carea.width < 0)
-                carea.width = 0;
-        }
-
-        if (carea.y + carea.height > top.y + top.height)
-        {
-            carea.height = top.y + top.height - carea.y;
-
-            if (carea.height < 0)
-                carea.height = 0;
-        }
-
-        const bool result = carea.isIntersecting(top);
-
-        mClipStack.push(carea);
-
-        return result;
-    }
-
-    void Graphics::popClipArea()
-    {
-        if (mClipStack.empty())
-            throw GCN_EXCEPTION("Tried to pop clip area from empty stack.");
-
-        mClipStack.pop();
-    }
-
-    const ClipRectangle& Graphics::getCurrentClipArea()
-    {
-        if (mClipStack.empty())
-            throw GCN_EXCEPTION("The clip area stack is empty.");
-
-        return mClipStack.top();
-    }
-
-    void Graphics::drawImage(const Image* image A_UNUSED,
-                             int dstX A_UNUSED, int dstY A_UNUSED)
-    {
-    }
-
-/*
-    void Graphics::setFont(Font* font)
-    {
-    }
-
-    void Graphics::drawText(const std::string& text, int x, int y,
-                            Alignment alignment)
-    {
-    }
-*/
-}  // namespace gcn
diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp
deleted file mode 100644
index 148a73d5a..000000000
--- a/src/guichan/include/guichan/cliprectangle.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_CLIPRECTANGLE_HPP
-#define GCN_CLIPRECTANGLE_HPP
-
-#include "guichan/rectangle.hpp"
-
-#include "localconsts.h"
-
-namespace gcn
-{
-    /**
-     * A rectangle used when dealing with clipping. A clip rectangle is
-     * a regular rectangle extended with variables for x offsets and y 
-     * offsets. The offsets are used for calculations from relative
-     * screen coordinates to actual screen coordinates.
-     */
-    class ClipRectangle final : public Rectangle
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        ClipRectangle();
-
-        /**
-         * Constructor.
-         *
-         * @param x0 The rectangle x coordinate.
-         * @param y0 The rectangle y coordinate.
-         * @param width0 The rectangle width.
-         * @param height0 The rectangle height.
-         * @param xOffset0 The offset of the x coordinate. Used to for
-         *                 calculating the actual screen coordinate from
-         *                 the relative screen coordinate.
-         * @param yOffset0 The offset of the y coordinate. Used to for
-         *                 calculating the actual screen coordinate from
-         *                 the relative screen coordinate.
-         */
-        ClipRectangle(const int x0,
-                      const int y0,
-                      const int width0,
-                      const int height0,
-                      const int xOffset0,
-                      const int yOffset0);
-
-        /**
-         * Copy constructor. Copies x, y, width and height 
-         * field from a rectangle to a clip rectangle.
-         *
-         * @param other The rectangle to copy data from.
-         * @returns A clip rectangle with data copyied from a rectangle.
-         */
-        const ClipRectangle& operator=(const Rectangle& other);
-
-        /**
-         * Holds the x offset of the x coordinate.
-         */
-        int xOffset;
-
-        /**
-         * Holds the y offset of the y coordinate.
-         */
-        int yOffset;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_CLIPRECTANGLE_HPP
diff --git a/src/guichan/include/guichan/exception.hpp b/src/guichan/include/guichan/exception.hpp
deleted file mode 100644
index a60152c96..000000000
--- a/src/guichan/include/guichan/exception.hpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_EXCEPTION_HPP
-#define GCN_EXCEPTION_HPP
-
-#include <string>
-
-#include "localconsts.h"
-
-#ifndef __FUNCTION__
-#define __FUNCTION__ "?"
-#endif
-
-/*
- * A macro used to create a standard exception object.
- * What it basicly does is that it creates a new exception
- * and automatically sets the filename and line number where
- * the exception occured by using other compiler macros.
- */
-#define GCN_EXCEPTION(mess) gcn::Exception(mess,   \
-                            __FUNCTION__,          \
-                            __FILE__,              \
-                            __LINE__)
-
-namespace gcn
-{
-
-    /**
-     * An exception containing a message, a file and a line number
-     * where the exception occured. Guichan will only throw exceptions 
-     * of this class. 
-     * 
-     * You can use this class for your own exceptions that has
-     * something to do with a GUI exception. A nifty feature of the
-     * excpetion class is that it can tell you from which line and
-     * file it was thrown. To make things easier when throwing
-     * exceptions there exists a macro for creating exceptions
-     * which automatically sets the filename and line number.
-     *
-     * EXAMPLE: @code
-     *          throw GCN_EXCEPTION("my error message");
-     *          @endcode
-     */
-    class Exception final
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        Exception();
-
-        /**
-         * Constructor.
-         *
-         * @param message The error message of the exception.
-         */
-        explicit Exception(const std::string& message);
-
-        /**
-         * Constructor.
-         *
-         * NOTE: Don't use this constructor. Use the GCN_EXCEPTION macro instead.
-         *       This constructor merely exists for the GCN_EXCEPTION macro to
-         *       use.
-         *
-         * @param message The error message of the exception.
-         * @param function The function name where the exception occured.
-         * @param filename The name of the file where the exception occured.
-         * @param line The line number in the source code where the exception
-         *             occured.
-         */
-        Exception(const std::string& message,
-                  const std::string& function,
-                  const std::string& filename,
-                  const unsigned int line);
-
-        /**
-         * Gets the function name where the exception occured.
-         *
-         * @return The function name where the exception occured.
-         */
-        const std::string& getFunction() const A_WARN_UNUSED;
-
-        /**
-         * Gets the error message of the exception.
-         *
-         * @return The error message of the exception.
-         */
-        const std::string& getMessage() const A_WARN_UNUSED;
-
-        /**
-         * Gets the filename where the exception occured.
-         *
-         * @return The filename where the exception occured.
-         */
-        const std::string& getFilename() const A_WARN_UNUSED;
-
-        /**
-         * Gets the line number where the exception occured.
-         *
-         * @return The line number where the exception occured.
-         */
-        unsigned int getLine() const A_WARN_UNUSED;
-
-    protected:
-        /**
-         * Holds the name of the function name where the
-         * exception occured.
-         */
-        std::string mFunction;
-
-        /**
-         * Holds the error message of the exception.
-         */
-        std::string mMessage;
-
-        /**
-         * Holds the filename where the exception occured.
-         */
-        std::string mFilename;
-
-        /**
-         * Holds the line number where the exception occured.
-         */
-        unsigned int mLine;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_EXCEPTION_HPP
-
-/*
- * "Final Fantasy XI is the BEST!... It's even better then water!"
- *  - Astrolite
- * I believe it's WoW now days.
- */
diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp
deleted file mode 100644
index 6cd326d33..000000000
--- a/src/guichan/include/guichan/focushandler.hpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_FOCUSHANDLER_HPP
-#define GCN_FOCUSHANDLER_HPP
-
-#include <vector>
-
-#include "guichan/event.hpp"
-
-namespace gcn
-{
-    class Widget;
-
-    /**
-     * Handles focus for widgets in a Gui. Each Gui has at least one
-     * focus handler.
-     * You will probably not use the focus handler directly as Widget 
-     * has functions that automatically uses the active focus handler.
-     *
-     * @see Widget::isFocus, Widget::isModalFocused, 
-     *      Widget::isModalMouseInputFocused, Widget::requestFocus,
-     *      Widget::requestModalFocus, Widget::requestModalMouseInputFocus,
-     *      Widget::releaseModalFocus, Widget::relaseModalMouseInputFocus, 
-     *      Widget::setFocusable, Widget::isFocusable, FocusListener
-     *
-     * @since 0.1.0
-     */
-    class FocusHandler
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        FocusHandler();
-
-        A_DELETE_COPY(FocusHandler)
-
-        /**
-         * Destructor.
-         */
-        virtual ~FocusHandler()
-        { }
-
-        /**
-         * Requests focus for a widget. Focus will only be granted to a widget
-         * if it's focusable and if no other widget has modal focus.
-         * If a widget receives focus a focus event will be sent to the 
-         * focus listeners of the widget.
-         *
-         * @param widget The widget to request focus for.
-         * @see isFocused, Widget::requestFocus
-         */
-        virtual void requestFocus(Widget* widget);
-
-        /**
-         * Requests modal focus for a widget. Focus will only be granted
-         * to a widget if it's focusable and if no other widget has modal 
-         * focus.
-         *
-         * @param widget The widget to request modal focus for.
-         * @throws Exception when another widget already has modal focus.
-         * @see releaseModalFocus, Widget::requestModalFocus
-         */
-        virtual void requestModalFocus(Widget* widget);
-
-        /**
-         * Requests modal mouse input focus for a widget. Focus will only 
-         * be granted to a widget if it's focusable and if no other widget 
-         * has modal mouse input focus.
-         *
-         * Modal mouse input focus means no other widget then the widget with 
-         * modal mouse input focus will receive mouse input. The widget with 
-         * modal mouse input focus will also receive mouse input no matter what 
-         * the mouse input is or where the mouse input occurs.
-         *
-         * @param widget The widget to focus for modal mouse input focus.
-         * @throws Exception when another widget already has modal mouse input 
-         *         focus.
-         * @see releaseModalMouseInputFocus, Widget::requestModalMouseInputFocus
-         */
-        virtual void requestModalMouseInputFocus(Widget* widget);
-
-        /**
-         * Releases modal focus if the widget has modal focus.
-         * If the widget doesn't have modal focus no relase will occur.
-         *
-         * @param widget The widget to release modal focus for.
-         * @see reuqestModalFocus, Widget::releaseModalFocus
-         */
-        virtual void releaseModalFocus(Widget* widget);
-
-        /**
-         * Releases modal mouse input focus if the widget has modal mouse input
-         * focus. If the widget doesn't have modal mouse input focus no relase 
-         * will occur.
-         *
-         * @param widget the widget to release modal mouse input focus for.
-         * @see requestModalMouseInputFocus, Widget::releaseModalMouseInputFocus
-         */
-        virtual void releaseModalMouseInputFocus(Widget* widget);
-
-        /**
-         * Checks if a widget is focused.
-         *
-         * @param widget The widget to check.
-         * @return True if the widget is focused, false otherwise.
-         * @see Widget::isFocused
-         */
-        virtual bool isFocused(const Widget* widget) const;
-
-        /**
-         * Gets the widget with focus.
-         *
-         * @return The widget with focus. NULL if no widget has focus.
-         */
-        virtual Widget* getFocused() const A_WARN_UNUSED;
-
-        /**
-         * Gets the widget with modal focus.
-         *
-         * @return The widget with modal focus. NULL if no widget has
-         *         modal focus.
-         */
-        virtual Widget* getModalFocused() const A_WARN_UNUSED;
-
-        /**
-         * Gets the widget with modal mouse input focus.
-         *
-         * @return The widget with modal mouse input focus. NULL if
-         *         no widget has modal mouse input focus.
-         */
-        virtual Widget* getModalMouseInputFocused() const A_WARN_UNUSED;
-
-        /**
-         * Focuses the next widget added to a conainer. 
-         * If no widget has focus the first widget gets focus. The order 
-         * in which the widgets are focused is determined by the order
-         * they were added to a container.
-         *
-         * @see focusPrevious
-         */
-        virtual void focusNext();
-
-        /**
-         * Focuses the previous widget added to a contaienr. 
-         * If no widget has focus the first widget gets focus. The order 
-         * in which the widgets are focused is determined by the order
-         * they were added to a container.
-         *
-         * @see focusNext
-         */
-        virtual void focusPrevious();
-
-        /**
-         * Adds a widget to by handles by the focus handler.
-         *
-         * @param widget The widget to add.
-         * @see remove
-         */
-        virtual void add(Widget* widget);
-
-        /**
-         * Removes a widget from the focus handler.
-         *
-         * @param widget The widget to remove.
-         * @see add
-         */
-        virtual void remove(Widget* widget);
-
-        /**
-         * Focuses nothing. A focus event will also be sent to the 
-         * focused widget's focus listeners if a widget has focus.
-         */
-        virtual void focusNone();
-
-        /**
-         * Focuses the next widget which allows tabbing in unless 
-         * the current focused Widget disallows tabbing out.
-         * 
-         * @see tabPrevious
-         */
-        virtual void tabNext();
-
-        /**
-         * Focuses the previous widget which allows tabbing in unless 
-         * current focused widget disallows tabbing out.
-         *
-         * @see tabNext
-         */
-        virtual void tabPrevious();
-
-        /**
-         * Gets the widget being dragged. Used by the Gui class to 
-         * keep track of the dragged widget.
-         * 
-         * @return the widget being dragged.
-         * @see setDraggedWidget
-         */
-        virtual Widget* getDraggedWidget() A_WARN_UNUSED;
-
-        /**
-         * Sets the widget being dragged. Used by the Gui class to 
-         * keep track of the dragged widget.
-         * 
-         * @param draggedWidget The widget being dragged.
-         * @see getDraggedWidget
-         */
-        virtual void setDraggedWidget(Widget* draggedWidget);
-
-        /**
-         * Gets the last widget with the mouse. Used by the Gui class 
-         * to keep track the last widget with the mouse.
-         * 
-         * @return The last widget with the mouse.
-         * @see setLastWidgetWithMouse
-         */ 
-        virtual Widget* getLastWidgetWithMouse() A_WARN_UNUSED;
-
-        /**
-         * Sets the last widget with the mouse. Used by the Gui class 
-         * to keep track the last widget with the mouse.
-         *
-         * @param lastWidgetWithMouse The last widget with the mouse.
-         * @see getLastWidgetWithMouse
-         */
-        virtual void setLastWidgetWithMouse(Widget* lastWidgetWithMouse);
-
-        /**
-         * Gets the last widget with modal focus.
-         * 
-         * @return The last widget with modal focus.
-         * @see setLastWidgetWithModalFocus
-         */
-        virtual Widget* getLastWidgetWithModalFocus() A_WARN_UNUSED;
-
-        /**
-         * Sets the last widget with modal focus.
-         * 
-         * @param widget The last widget with modal focus.
-         * @see getLastWidgetWithModalFocus
-         */
-        virtual void setLastWidgetWithModalFocus(Widget* widget);
-
-        /**
-         * Gets the last widget with modal mouse input focus.
-         *
-         * @return The last widget with modal mouse input focus.
-         * @see setLastWidgetWithModalMouseInputFocus
-         */
-        virtual Widget* getLastWidgetWithModalMouseInputFocus() A_WARN_UNUSED;
-
-        /**
-         * Sets the last widget with modal mouse input focus.
-         *
-         * @param widget The last widget with modal mouse input focus.
-         * @see getLastWidgetWithModalMouseInputFocus
-         */
-        virtual void setLastWidgetWithModalMouseInputFocus(Widget* widget);
-
-        /**
-         * Gets the last widget pressed. Used by the Gui class to keep track
-         * of pressed widgets.
-         *
-         * @return The last widget pressed. 
-         * @see setLastWidgetPressed
-         */
-        virtual Widget* getLastWidgetPressed() A_WARN_UNUSED;
-
-        /**
-         * Sets the last widget pressed. Used by the Gui class to keep track
-         * of pressed widgets.
-         *
-         * @param lastWidgetPressed The last widget pressed.
-         * @see getLastWidgetPressed
-         */
-        virtual void setLastWidgetPressed(Widget* lastWidgetPressed);
-
-    protected:
-        /**
-         * Distributes a focus lost event.
-         *
-         * @param focusEvent the event to distribute.
-         * @since 0.7.0
-         */
-        virtual void distributeFocusLostEvent(const Event& focusEvent);
-
-        /**
-         * Distributes a focus gained event.
-         *
-         * @param focusEvent the event to distribute.
-         * @since 0.7.0
-         */
-        virtual void distributeFocusGainedEvent(const Event& focusEvent);
-
-        /**
-         * Typedef.
-         */
-        typedef std::vector<Widget*> WidgetVector;
-
-        /**
-         * Typedef.
-         */
-        typedef WidgetVector::iterator WidgetIterator;
-
-        /**
-         * Holds the widgets currently being handled by the
-         * focus handler.
-         */
-        WidgetVector mWidgets;
-
-        /**
-         * Holds the focused widget. NULL if no widget has focus.
-         */
-        Widget* mFocusedWidget;
-
-        /**
-         * Holds the modal focused widget. NULL if no widget has
-         * modal focused.
-         */
-        Widget* mModalFocusedWidget;
-
-        /**
-         * Holds the modal mouse input focused widget. NULL if no widget 
-         * is being dragged.
-         */
-        Widget* mModalMouseInputFocusedWidget;
-
-        /** 
-         * Holds the dragged widget. NULL if no widget is
-         * being dragged.
-         */
-        Widget* mDraggedWidget;
-
-        /**
-         * Holds the last widget with the mouse.
-         */
-        Widget* mLastWidgetWithMouse;
-
-        /**
-         * Holds the last widget with modal focus.
-         */
-        Widget* mLastWidgetWithModalFocus;
-
-        /**
-         * Holds the last widget with modal mouse input focus.
-         */
-        Widget* mLastWidgetWithModalMouseInputFocus;
-
-        /**
-         * Holds the last widget pressed.
-         */
-        Widget* mLastWidgetPressed;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_FOCUSHANDLER_HPP
diff --git a/src/guichan/include/guichan/font.hpp b/src/guichan/include/guichan/font.hpp
deleted file mode 100644
index 8e8ad18c9..000000000
--- a/src/guichan/include/guichan/font.hpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_FONT_HPP
-#define GCN_FONT_HPP
-
-#include <string>
-
-#include "localconsts.h"
-
-namespace gcn
-{
-    class Graphics;
-
-    /**
-     * Interface for a font.
-     *
-     * @see ImageFont
-     */
-    class Font
-    {
-    public:
-        /**
-         * Destructor.
-         */
-        virtual ~Font()
-        { }
-
-        /**
-         * Gets the width of a string. The width of a string is not necesserily
-         * the sum of all the widths of it's glyphs.
-         *
-         * @param text The string to return the width of.
-         * @return The width of a string.
-         */
-        virtual int getWidth(const std::string& text) const A_WARN_UNUSED = 0;
-
-        /**
-         * Gets the height of the glyphs in the font.
-         *
-         * @return The height of the glyphs int the font.
-         */
-        virtual int getHeight() const A_WARN_UNUSED = 0;
-
-        /**
-         * Gets a string index in a string providing an x coordinate.
-         * Used to retrive a string index (for a character in a
-         * string) at a certain x position. It is especially useful
-         * when a mouse clicks in a TextField and you want to know which
-         * character was clicked.
-         *
-         * @return A string index in a string providing an x coordinate.
-         */
-        virtual int getStringIndexAt(const std::string& text,
-                                     const int x) const A_WARN_UNUSED;
-
-        /**
-         * Draws a string.
-         *
-         * NOTE: You normally won't use this function to draw text since
-         *       Graphics contains better functions for drawing text.
-         *
-         * @param graphics A Graphics object to use for drawing.
-         * @param text The string to draw.
-         * @param x The x coordinate where to draw the string.
-         * @param y The y coordinate where to draw the string.
-         */
-        virtual void drawString(Graphics* graphics, const std::string& text,
-                                int x, int y) = 0;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_FONT_HPP
diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp
deleted file mode 100644
index dd15827fd..000000000
--- a/src/guichan/include/guichan/graphics.hpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_GRAPHICS_HPP
-#define GCN_GRAPHICS_HPP
-
-#include <iosfwd>
-#include <stack>
-
-#include "guichan/cliprectangle.hpp"
-
-namespace gcn
-{
-    class Color;
-    class Font;
-    class Image;
-
-    /**
-     * Abstract class for providing drawing primitve functions. 
-     * It contains all vital functions for drawing.
-     *
-     * Guichan contains implementations of Graphics for common 
-     * libraries like the Allegro library, the HGE library, 
-     * the OpenGL library, the OpenLayer library, and the SDL library. 
-     * To make Guichan usable with other libraries, a Graphics class
-     * must be implemented.
-     *
-     * In Graphics you can set clip areas to limit drawing to certain
-     * areas of the screen. Clip areas are put on a stack, which 
-     * means that you can push smaller and smaller clip areas onto the 
-     * stack. All coordinates will be relative to the top most clip area. 
-     * In most cases you won't have to worry about the clip areas, 
-     * unless you want to implement some really complex widget. 
-     * Pushing and poping of clip areas are handled automatically by 
-     * container widgets when their child widgets are drawn.
-     *
-     * IMPORTANT: Remember to pop each clip area that you pushed on the stack
-     * after you are done with it.
-     *
-     * If you feel that Graphics is to restrictive for your needs, 
-     * there is no one stopping you from using your own code for drawing 
-     * in widgets. You could for instance use pure SDL in the drawing of 
-     * widgets bypassing Graphics. This might however hurt portability of 
-     * your application.
-     *
-     * If you implement a Graphics class not present in Guichan we would 
-     * be very happy to add it to Guichan.
-     *
-     * @see AllegroGraphics, HGEGraphics, OpenLayerGraphics, OpenGLGraphics, 
-     *      SDLGraphics, Image
-     * @since 0.1.0
-     */
-    class Graphics
-    {
-    public:
-        /**
-         * Alignments for text drawing.
-         */
-        enum Alignment
-        {
-            LEFT = 0,
-            CENTER,
-            RIGHT
-        };
-
-        /**
-         * Constructor.
-         */
-        Graphics();
-
-        A_DELETE_COPY(Graphics)
-
-        /**
-         * Destructor.
-         */
-        virtual ~Graphics()
-        { }
-
-        /**
-         * Initializes drawing. Called by the Gui when Gui::draw() is called.
-         * It is needed by some implementations of Graphics to perform
-         * preparations before drawing. An example of such an implementation
-         * is the OpenGLGraphics.
-         *
-         * NOTE: You will never need to call this function yourself, unless
-         *       you use a Graphics object outside of Guichan.
-         *
-         * @see _endDraw, Gui::draw
-         */
-        virtual void _beginDraw()
-        { }
-
-        /**
-         * Deinitializes drawing. Called by the Gui when a Gui::draw() is done.
-         * done. It should reset any state changes made by _beginDraw().
-         *
-         * NOTE: You will never need to call this function yourself, unless
-         *       you use a Graphics object outside of Guichan.
-         *
-         * @see _beginDraw, Gui::draw
-         */
-        virtual void _endDraw()
-        { }
-
-        /**
-         * Pushes a clip area onto the stack. The x and y coordinates in the
-         * rectangle is  relative to the last pushed clip area.
-         * If the new area falls outside the current clip area, it will be
-         * clipped as necessary.
-         *
-         * If a clip area is outside of the top clip area a clip area with
-         * zero width and height will be pushed.
-         *
-         * @param area The clip area to be pushed onto the stack.
-         * @return False if the the new area lays outside the current clip 
-         *         area.
-         */
-        virtual bool pushClipArea(Rectangle area);
-
-        /**
-         * Removes the top most clip area from the stack.
-         *
-         * @throws Exception if the stack is empty.
-         */
-        virtual void popClipArea();
-
-        /**
-         * Gets the current clip area. Usefull if you want to do drawing
-         * bypassing Graphics.
-         *
-         * @return The current clip area.
-         */
-        virtual const ClipRectangle& getCurrentClipArea();
-
-        /**
-         * Draws a part of an image.
-         *
-         * NOTE: Width and height arguments will not scale the image but
-         *       specifies the size of the part to be drawn. If you want
-         *       to draw the whole image there is a simplified version of
-         *       this function.
-         *
-         * EXAMPLE: @code drawImage(myImage, 10, 10, 20, 20, 40, 40); @endcode
-         *          Will draw a rectangular piece of myImage starting at
-         *          coordinate (10, 10) in myImage, with width and height 40.
-         *          The piece will be drawn with it's top left corner at
-         *          coordinate (20, 20).
-         *
-         * @param image The image to draw.
-         * @param srcX The source image x coordinate.
-         * @param srcY The source image y coordinate.
-         * @param dstX The destination x coordinate.
-         * @param dstY The destination y coordinate.
-         * @param width The width of the piece.
-         * @param height The height of the piece.
-         */
-        virtual void drawImage(const Image* image,
-                               int srcX,
-                               int srcY,
-                               int dstX,
-                               int dstY,
-                               int width,
-                               int height) = 0;
-        /**
-         * Draws an image. A simplified version of the other drawImage.
-         * It will draw a whole image at the coordinate you specify.
-         * It is equivalent to calling:
-         * @code drawImage(myImage, 0, 0, dstX, dstY, image->getWidth(), \
-         image->getHeight()); @endcode
-         */
-        virtual void drawImage(const Image* image, int dstX, int dstY);
-
-        /**
-         * Draws a single point/pixel.
-         *
-         * @param x The x coordinate.
-         * @param y The y coordinate.
-         */
-        virtual void drawPoint(int x, int y) = 0;
-
-        /**
-         * Ddraws a line.
-         *
-         * @param x1 The first x coordinate.
-         * @param y1 The first y coordinate.
-         * @param x2 The second x coordinate.
-         * @param y2 The second y coordinate.
-         */
-        virtual void drawLine(int x1, int y1, int x2, int y2) = 0;
-
-        /**
-         * Draws a simple, non-filled, rectangle with a one pixel width.
-         *
-         * @param rectangle The rectangle to draw.
-         */
-        virtual void drawRectangle(const Rectangle& rectangle) = 0;
-
-        /**
-         * Draws a filled rectangle.
-         *
-         * @param rectangle The filled rectangle to draw.
-         */
-        virtual void fillRectangle(const Rectangle& rectangle) = 0;
-
-        /**
-         * Sets the color to use when drawing.
-         *
-         * @param color A color.
-         * @see getColor
-         */
-        virtual void setColor(const Color& color) = 0;
-
-        /**
-         * Gets the color to use when drawing.
-         *
-         * @return The color used when drawing.
-         * @see setColor
-         */
-        virtual const Color& getColor() const = 0;
-
-    protected:
-        /**
-         * Holds the clip area stack.
-         */
-        std::stack<ClipRectangle> mClipStack;
-
-        /**
-         * Holds the current font.
-         */
-        Font* mFont;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_GRAPHICS_HPP
diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp
deleted file mode 100644
index 30b46676d..000000000
--- a/src/guichan/include/guichan/inputevent.hpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_INPUTEVENT_HPP
-#define GCN_INPUTEVENT_HPP
-
-#include "guichan/event.hpp"
-
-namespace gcn
-{
-    /**
-     * Base class for all events concerning input.
-     *
-     * @author Olof Naessén
-     * @since 0.6.0
-     */
-    class InputEvent: public Event
-    {
-    public:
-        /**
-         * Constructor.
-         *
-         * @param source The source widget of the event.
-         * @param isShiftPressed True if shift is pressed, false otherwise.
-         * @param isControlPressed True if control is pressed, false otherwise.
-         * @param isAltPressed True if alt is pressed, false otherwise.
-         * @param isMetaPressed True if meta is pressed, false otherwise.
-         */
-        InputEvent(Widget *const source,
-                   const bool shiftPressed,
-                   const bool controlPressed,
-                   const bool altPressed,
-                   const bool metaPressed);
-
-        /**
-         * Checks if shift is pressed.
-         *
-         * @return True if shift was pressed at the same time as the key,
-         *         false otherwise.
-         */
-        bool isShiftPressed() const A_WARN_UNUSED;
-
-        /**
-         * Checks if control is pressed.
-         *
-         * @return True if control was pressed at the same time as the key,
-         *         false otherwise.
-         */
-        bool isControlPressed() const A_WARN_UNUSED;
-
-        /**
-         * Checks if alt is pressed.
-         *
-         * @return True if alt was pressed at the same time as the key,
-         *         false otherwise.
-         */
-        bool isAltPressed() const A_WARN_UNUSED;
-
-        /**
-         * Checks whether meta is pressed.
-         *
-         * @return True if meta was pressed at the same time as the key,
-         *         false otherwise.
-         */
-        bool isMetaPressed() const A_WARN_UNUSED;
-
-        /**
-         * Marks the event as consumed. Input event listeners may discard
-         * consumed input or act on consumed input. An example of a widget
-         * that discards consumed input is the ScrollArea widget that 
-         * discards consumed mouse wheel events so the ScrollArea will not 
-         * scroll if for instance a Slider's value inside the ScrollArea was 
-         * changed with the mouse wheel.
-         *
-         * @see isConsumed
-         */
-        void consume();
-
-        /**
-         * Checks if the input event is consumed.
-         *
-         * @return True if the input event is consumed, 
-         *         false otherwise.
-         * @see consume
-         */
-        bool isConsumed() const A_WARN_UNUSED;
-
-    protected:
-        /**
-         * True if shift is pressed, false otherwise.
-         */
-        bool mShiftPressed;
-
-        /**
-         * True if control is pressed, false otherwise.
-         */
-        bool mControlPressed;
-
-        /**
-         * True if alt is pressed, false otherwise.
-         */
-        bool mAltPressed;
-
-        /**
-         * True if meta is pressed, false otherwise.
-         */
-        bool mMetaPressed;
-
-        /**
-         * True if the input event is consumed, 
-         * false otherwise.
-         */
-        bool mIsConsumed;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_INPUTEVENT_HPP
diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp
deleted file mode 100644
index 421165d1c..000000000
--- a/src/guichan/include/guichan/keyinput.hpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_KEYINPUT_HPP
-#define GCN_KEYINPUT_HPP
-
-#include "guichan/key.hpp"
-
-namespace gcn
-{
-    /**
-     * Internal class that represents key input. Generally you won't have to
-     * bother using this class unless you implement an Input class for
-     * a back end.
-     *
-     * @since 0.1.0
-     */
-    class KeyInput
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        KeyInput() :
-            mKey(0),
-            mType(0),
-            mShiftPressed(false),
-            mControlPressed(false),
-            mAltPressed(false),
-            mMetaPressed(false),
-            mNumericPad(false)
-        { }
-
-        /**
-         * Constructor.
-         *
-         * @param key The key of the key input.
-         * @param type The type of key input.
-         */
-        KeyInput(const Key& key, unsigned int type);
-
-        /**
-         * Sets the type of the key input.
-         *
-         * @param type The type of key input.
-         * @see getType
-         */
-        void setType(unsigned int type);
-
-        /**
-         * Gets the type of the key input.
-         *
-         * @return the input type.
-         * @see setType
-         */
-        int getType() const A_WARN_UNUSED;
-
-        /**
-         * Sets the key of the key input.
-         *
-         * @param key The key of the key input.
-         * @see getKey
-         */
-        void setKey(const Key& key);
-
-        /**
-         * Gets the key of the key input.
-         *
-         * @return The key of the key input.
-         * @see setKey
-         */
-        const Key& getKey() const A_WARN_UNUSED;
-
-        /**
-         * Checks if shift is pressed.
-         *
-         * @return True if shift was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setShiftPressed
-         * @since 0.6.0
-         */
-        bool isShiftPressed() const A_WARN_UNUSED;
-
-        /**
-         * Sets shift to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if shift is pressed, false otherwise.
-         * @see isShiftPressed
-         * @since 0.6.0
-         */
-        void setShiftPressed(bool pressed);
-
-        /**
-         * Checks if control is pressed.
-         *
-         * @return True if control was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setControlPressed
-         * @since 0.6.0
-         */
-        bool isControlPressed() const A_WARN_UNUSED;
-
-        /**
-         * Sets control to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if control is pressed, false otherwise.
-         * @see isControlPressed
-         * @since 0.6.0
-         */
-        void setControlPressed(bool pressed);
-
-        /**
-         * Checks if alt is pressed.
-         *
-         * @return True if alt was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setAltPressed
-         * @since 0.6.0
-         */
-        bool isAltPressed() const;
-
-        /**
-         * Sets the alt to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if alt is pressed at the same 
-         *                time as the key, , false otherwise.
-         * @see isAltPressed
-         * @since 0.6.0
-         */
-        void setAltPressed(bool pressed);
-
-        /**
-         * Checks if meta is pressed.
-         *
-         * @return True if meta was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setMetaPressed
-         * @since 0.6.0
-         */
-        bool isMetaPressed() const A_WARN_UNUSED;
-
-        /**
-         * Sets meta to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if meta is pressed at the same
-         *                time as the key, false otherwise.
-         * @see isMetaPressed
-         * @since 0.6.0
-         */
-        void setMetaPressed(bool pressed);
-
-        /**
-         * Checks if the key was pressed at the numeric pad.
-         *
-         * @return True if key pressed at the numeric pad,
-         *         false otherwise.
-         * @setNumericPad
-         * @since 0.6.0
-         */
-        bool isNumericPad() const A_WARN_UNUSED;
-
-        /**
-         * Sets the key to be pressed at the numeric pad.
-         *
-         * @param numpad True if the key was pressed at the numeric
-         *               pad, false otherwise.
-         * @see isNumericPad
-         * @since 0.6.0
-         */
-        void setNumericPad(bool numpad);
-
-        /**
-         * Key input types. This enum corresponds to the enum with event
-         * types on KeyEvent for easy mapping.
-         */
-        enum
-        {
-            PRESSED = 0,
-            RELEASED
-        };
-
-    protected:
-        /**
-         * Holds the key of the key input.
-         */
-        Key mKey;
-
-        /**
-         * Holds the type of the key input.
-         */
-        unsigned int mType;
-
-        /**
-         * True if shift was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mShiftPressed;
-
-        /**
-         * True if control was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mControlPressed;
-
-        /**
-         * True if alt was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mAltPressed;
-
-        /**
-         * True if meta was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mMetaPressed;
-
-        /**
-         * True if the numeric pad was used when the key was pressed,
-         * false otherwise.
-         */ 
-        bool mNumericPad;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_KEYINPUT_HPP
diff --git a/src/guichan/include/guichan/mouseinput.hpp b/src/guichan/include/guichan/mouseinput.hpp
deleted file mode 100644
index 018205740..000000000
--- a/src/guichan/include/guichan/mouseinput.hpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_MOUSEINPUT_HPP
-#define GCN_MOUSEINPUT_HPP
-
-#include "localconsts.h"
-
-namespace gcn
-{
-
-    /**
-     * Internal class that represents mouse input. Generally you won't have to
-     * bother using this class unless you implement an Input class for
-     * a back end.
-     *
-     * @author Olof Naessén
-     * @author Per Larsson
-     * @since 0.1.0
-     */
-    class MouseInput
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        MouseInput() :
-            mType(0),
-            mButton(0),
-            mTimeStamp(0),
-            mX(0),
-            mY(0)
-        { }
-
-        /**
-         * Constructor.
-         *
-         * @param button The button pressed.
-         * @param type The type of mouse input.
-         * @param x The mouse x coordinate.
-         * @param y The mouse y coordinate.
-         * @param timeStamp The timestamp of the mouse input. Used to
-         *                  check for double clicks.
-         */
-        MouseInput(const unsigned int button,
-                   const unsigned int type,
-                   const int x,
-                   const int y,
-                   const int timeStamp);
-
-        /**
-         * Sets the type of the mouse input.
-         *
-         * @param type The type of the mouse input. Should be a value from the
-         *             mouse event type enum
-         * @see getType
-         * @since 0.1.0
-         */
-        void setType(unsigned int type);
-
-        /**
-         * Gets the type of the mouse input.
-         *
-         * @return The type of the mouse input. A value from the mouse event
-         *         type enum.
-         * @see setType
-         * @since 0.1.0
-         */
-        unsigned int getType() const A_WARN_UNUSED;
-
-        /**
-         * Sets the button pressed.
-         *
-         * @param button The button pressed. Should be one of the values
-         *               in the mouse event button enum.
-         * @see getButton.
-         * @since 0.1.0
-         */
-        void setButton(unsigned int button);
-
-        /**
-         * Gets the button pressed.
-         *
-         * @return The button pressed. A value from the mouse event
-         *         button enum.
-         * @see setButton
-         * @since 0.1.0
-         */
-        unsigned int getButton() const A_WARN_UNUSED;
-
-        /**
-         * Sets the timestamp for the mouse input.
-         * Used to check for double clicks.
-         *
-         * @param timeStamp The timestamp of the mouse input.
-         * @see getTimeStamp
-         * @since 0.1.0
-         */
-        void setTimeStamp(int timeStamp);
-
-        /**
-         * Gets the time stamp of the input.
-         * Used to check for double clicks.
-         *
-         * @return The time stamp of the mouse input.
-         * @see setTimeStamp
-         * @since 0.1.0
-         */
-        int getTimeStamp() const A_WARN_UNUSED;
-
-        /**
-         * Sets the x coordinate of the mouse input.
-         *
-         * @param x The x coordinate of the mouse input.
-         * @see getX
-         * @since 0.6.0
-         */
-        void setX(int x);
-
-        /**
-         * Gets the x coordinate of the mouse input.
-         *
-         * @return The x coordinate of the mouse input.
-         * @see setX
-         * @since 0.6.0
-         */
-        int getX() const A_WARN_UNUSED;
-
-        /**
-         * Sets the y coordinate of the mouse input.
-         *
-         * @param y The y coordinate of the mouse input.
-         * @see getY
-         * @since 0.6.0
-         */
-        void setY(int y);
-
-        /**
-         * Gets the y coordinate of the mouse input.
-         *
-         * @return The y coordinate of the mouse input.
-         * @see setY
-         * @since 0.6.0
-         */
-        int getY() const A_WARN_UNUSED;
-
-        /**
-         * Mouse input event types. This enum partially corresponds
-         * to the enum with event types in MouseEvent for easy mapping.
-         */
-        enum
-        {
-            MOVED = 0,
-            PRESSED,
-            RELEASED,
-            WHEEL_MOVED_DOWN,
-            WHEEL_MOVED_UP
-        };
-
-        /**
-         * Mouse button types.
-         */
-        enum
-        {
-            EMPTY = 0,
-            LEFT,
-            RIGHT,
-            MIDDLE
-        };
-
-    protected:
-        /**
-         * Holds the type of the mouse input.
-         */
-        unsigned int mType;
-
-        /**
-         * Holds the button of the mouse input.
-         */
-        unsigned int mButton;
-
-        /** 
-         * Holds the timestamp of the mouse input. Used to 
-         * check for double clicks.
-         */
-        int mTimeStamp;
-
-        /** 
-         * Holds the x coordinate of the mouse input.
-         */
-        int mX;
-
-        /** 
-         * Holds the y coordinate of the mouse input.
-         */
-        int mY;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_MOUSEINPUT_HPP
diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp
deleted file mode 100644
index 99818d42e..000000000
--- a/src/guichan/include/guichan/sdl/sdlpixel.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __  __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_SDLPIXEL_HPP
-#define GCN_SDLPIXEL_HPP
-
-#include "SDL.h"
-#include "guichan/color.hpp"
-
-namespace gcn
-{
-
-    /**
-     * Checks a pixels color of an SDL_Surface.
-     *
-     * @param surface an SDL_Surface where to check for a pixel color.
-     * @param x the x coordinate on the surface.
-     * @param y the y coordinate on the surface.
-     * @return a color of a pixel.
-     */
-    inline const Color SDLgetPixel(SDL_Surface* surface, int x, int y)
-    {
-        if (!surface)
-            return Color(0, 0, 0, 0);
-
-        int bpp = surface->format->BytesPerPixel;
-
-        SDL_LockSurface(surface);
-
-        Uint8 *p = static_cast<uint8_t*>(surface->pixels)
-            + y * surface->pitch + x * bpp;
-
-        unsigned int color = 0;
-
-        switch (bpp)
-        {
-            case 1:
-                color = *p;
-                break;
-
-            case 2:
-                color = *reinterpret_cast<Uint16*>(p);
-                break;
-
-            case 3:
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-                    color = p[0] << 16 | p[1] << 8 | p[2];
-#else
-                    color = p[0] | p[1] << 8 | p[2] << 16;
-#endif
-                break;
-
-          case 4:
-                color = *reinterpret_cast<Uint32*>(p);
-                break;
-
-          default:
-                color = *p;
-                break;
-        }
-
-        unsigned char r, g, b, a;
-
-        SDL_GetRGBA(color, surface->format, &r, &g, &b, &a);
-        SDL_UnlockSurface(surface);
-
-        return Color(r, g, b, a);
-    }
-
-    /**
-     * Puts a pixel on an SDL_Surface.
-     *
-     * @param x the x coordinate on the surface.
-     * @param y the y coordinate on the surface.
-     * @param color the color the pixel should be in.
-     */
-    inline void SDLputPixel(SDL_Surface* surface, int x, int y,
-                            const Color& color)
-    {
-        if (!surface)
-            return;
-
-        int bpp = surface->format->BytesPerPixel;
-
-        SDL_LockSurface(surface);
-
-        Uint8 *p = static_cast<uint8_t*>(surface->pixels)
-            + y * surface->pitch + x * bpp;
-
-        Uint32 pixel = SDL_MapRGB(surface->format,
-            static_cast<uint8_t>(color.r), static_cast<uint8_t>(color.g),
-            static_cast<uint8_t>(color.b));
-
-        switch (bpp)
-        {
-            case 1:
-                *p = static_cast<uint8_t>(pixel);
-                break;
-
-            case 2:
-                *reinterpret_cast<uint16_t*>(p) = static_cast<uint16_t>(pixel);
-                break;
-
-            case 3:
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-                p[0] = static_cast<uint8_t>((pixel >> 16) & 0xff);
-                p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff);
-                p[2] = static_cast<uint8_t>((pixel) & 0xff);
-#else
-                p[0] = static_cast<uint8_t>((pixel) & 0xff);
-                p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff);
-                p[2] = static_cast<uint8_t>((pixel >> 16) & 0xff);
-#endif
-                break;
-
-            case 4:
-                *reinterpret_cast<Uint32*>(p) = pixel;
-                break;
-
-            default:
-                break;
-        }
-
-        SDL_UnlockSurface(surface);
-    }
-
-    /**
-     * Blends two 32 bit colors together.
-     *
-     * @param src the source color.
-     * @param dst the destination color.
-     * @param a alpha.
-     */
-    inline unsigned int SDLAlpha32(unsigned int src, unsigned int dst,
-                                   unsigned char a)
-    {
-        unsigned int b = ((src & 0xff) * a + (dst & 0xff) * (255 - a)) >> 8;
-        unsigned int g = ((src & 0xff00) * a + (dst & 0xff00)
-            * (255 - a)) >> 8;
-        unsigned int r = ((src & 0xff0000) * a + (dst & 0xff0000)
-            * (255 - a)) >> 8;
-
-        return (b & 0xff) | (g & 0xff00) | (r & 0xff0000);
-    }
-
-    /**
-     * Blends two 16 bit colors together.
-     *
-     * @param src the source color.
-     * @param dst the destination color.
-     * @param a alpha.
-     */
-    inline unsigned short SDLAlpha16(unsigned short src, unsigned short dst,
-                                     unsigned char a, const SDL_PixelFormat *f)
-    {
-        unsigned int b = ((src & f->Rmask) * a + (dst & f->Rmask)
-            * (255 - a)) >> 8;
-        unsigned int g = ((src & f->Gmask) * a + (dst & f->Gmask)
-            * (255 - a)) >> 8;
-        unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask)
-            * (255 - a)) >> 8;
-
-        return static_cast<unsigned short>((b & f->Rmask)
-            | (g & f->Gmask) | (r & f->Bmask));
-    }
-
-    /*
-    typedef struct{
-        SDL_Palette *palette;
-        Uint8  BitsPerPixel;
-        Uint8  BytesPerPixel;
-        Uint32 Rmask, Gmask, Bmask, Amask;
-        Uint8  Rshift, Gshift, Bshift, Ashift;
-        Uint8  Rloss, Gloss, Bloss, Aloss;
-        Uint32 colorkey;
-        Uint8  alpha;
-    } SDL_PixelFormat;
-    */
-
-    /**
-     * Puts a pixel on an SDL_Surface with alpha
-     *
-     * @param x the x coordinate on the surface.
-     * @param y the y coordinate on the surface.
-     * @param color the color the pixel should be in.
-     */
-    inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y,
-                                 const Color& color)
-    {
-        int bpp = surface->format->BytesPerPixel;
-
-        SDL_LockSurface(surface);
-
-        Uint8 *p = static_cast<uint8_t*>(surface->pixels)
-            + y * surface->pitch + x * bpp;
-
-        Uint32 pixel = SDL_MapRGB(surface->format,
-            static_cast<uint8_t>(color.r),
-            static_cast<uint8_t>(color.g),
-            static_cast<uint8_t>(color.b));
-
-        switch (bpp)
-        {
-            case 1:
-                *p = static_cast<uint8_t>(pixel);
-                break;
-
-            case 2:
-                *reinterpret_cast<Uint16*>(p) = SDLAlpha16(
-                    static_cast<unsigned short>(pixel),
-                    *reinterpret_cast<unsigned short*>(p),
-                    static_cast<unsigned char>(color.a), surface->format);
-                break;
-
-            case 3:
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-                p[2] = static_cast<uint8_t>((p[2] * (255 - color.a)
-                    + color.b * color.a) >> 8);
-                p[1] = static_cast<uint8_t>((p[1] * (255 - color.a)
-                    + color.g * color.a) >> 8);
-                p[0] = static_cast<uint8_t>((p[0] * (255 - color.a)
-                    + color.r * color.a) >> 8);
-#else
-                p[0] = static_cast<uint8_t>((p[0] * (255 - color.a)
-                    + color.b * color.a) >> 8);
-                p[1] = static_cast<uint8_t>((p[1] * (255 - color.a)
-                    + color.g * color.a) >> 8);
-                p[2] = static_cast<uint8_t>((p[2] * (255 - color.a)
-                    + color.r * color.a) >> 8);
-#endif
-                break;
-
-            case 4:
-                *reinterpret_cast<Uint32*>(p) = SDLAlpha32(pixel,
-                    *reinterpret_cast<Uint32*>(p),
-                    static_cast<unsigned char>(color.a));
-                break;
-            default:
-                break;
-        }
-
-        SDL_UnlockSurface(surface);
-    }
-}  // namespace gcn
-
-#endif  // end GCN_SDLPIXEL_HPP
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
deleted file mode 100644
index fe02d3b14..000000000
--- a/src/guichan/include/guichan/widget.hpp
+++ /dev/null
@@ -1,1232 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_WIDGET_HPP
-#define GCN_WIDGET_HPP
-
-#include <list>
-#include <set>
-#include <string>
-
-#include "guichan/color.hpp"
-#include "guichan/rectangle.hpp"
-
-#include "localconsts.h"
-
-namespace gcn
-{
-    class ActionListener;
-    class BasicContainer;
-    class DeathListener;
-    class FocusHandler;
-    class FocusListener;
-    class Font;
-    class Graphics;
-    class KeyInput;
-    class KeyListener;
-    class MouseInput;
-    class MouseListener;
-    class WidgetListener;
-
-    /**
-     * Abstract class for widgets of Guichan. It contains basic functions 
-     * every widget should have.
-     *
-     * NOTE: Functions begining with underscore "_" should not
-     *       be overloaded unless you know what you are doing
-     *
-     * @author Olof Naessén
-     * @author Per Larsson.
-     * @since 0.1.0
-     */
-    class Widget
-    {
-    public:
-        /**
-         * Constructor. Resets member variables. Noteable, a widget is not
-         * focusable as default, therefore, widgets that are supposed to be
-         * focusable should overide this default in their own constructor.
-         */
-        Widget();
-
-        A_DELETE_COPY(Widget)
-
-        /**
-         * Default destructor.
-         */
-        virtual ~Widget();
-
-        /**
-         * Draws the widget. It is called by the parent widget when it is time
-         * for the widget to draw itself. The graphics object is set up so
-         * that all drawing is relative to the widget, i.e coordinate (0,0) is
-         * the top left corner of the widget. It is not possible to draw
-         * outside of a widget's dimension.
-         *
-         * @param graphics aA graphics object to draw with.
-         * @since 0.1.0
-         */
-        virtual void draw(Graphics* graphics) = 0;
-
-        /**
-         * Called when a widget is given a chance to draw a frame around itself.
-         * The frame is not considered a part of the widget, it only allows a frame
-         * to be drawn around the widget, thus a frame will never be included when
-         * calculating if a widget should receive events from user input. Also
-         * a widget's frame will never be included when calculating a widget's 
-         * position.
-         * 
-         * The size of the frame is calculated using the widget's frame size. 
-         * If a widget has a frame size of 10 pixels than the area the drawFrame 
-         * function can draw to will be the size of the widget with an additional 
-         * extension of 10 pixels in each direction.
-         *
-         * An example when drawFrame is a useful function is if a widget needs
-         * a glow around itself.
-         *
-         * @param graphics A graphics object to draw with.
-         * @see setFrameSize, getFrameSize
-         * @since 0.8.0
-         */
-        virtual void drawFrame(Graphics* graphics);
-
-        /**
-         * Sets the size of the widget's frame. The frame is not considered a part of 
-         * the widget, it only allows a frame to be drawn around the widget, thus a frame 
-         * will never be included when calculating if a widget should receive events 
-         * from user input. Also a widget's frame will never be included when calculating
-         * a widget's position.
-         *
-         * A frame size of 0 means that the widget has no frame. The default frame size
-         * is 0.
-         *
-         * @param frameSize The size of the widget's frame.
-         * @see getFrameSize, drawFrame
-         * @since 0.8.0
-         */
-        void setFrameSize(unsigned int frameSize);
-
-        /**
-         * Gets the size of the widget's frame. The frame is not considered a part of 
-         * the widget, it only allows a frame to be drawn around the widget, thus a frame 
-         * will never be included when calculating if a widget should receive events 
-         * from user input. Also a widget's frame will never be included when calculating
-         * a widget's position.
-         *
-         * A frame size of 0 means that the widget has no frame. The default frame size
-         * is 0.
-         *
-         * @return The size of the widget's frame.
-         * @see setFrameSize, drawFrame
-         * @since 0.8.0
-         */
-        unsigned int getFrameSize() const A_WARN_UNUSED;
-
-        /**
-         * Called for all widgets in the gui each time Gui::logic is called.
-         * You can do logic stuff here like playing an animation.
-         *
-         * @see Gui::logic
-         * @since 0.1.0
-         */
-        virtual void logic()
-        { }
-
-        /**
-         * Gets the widget's parent container.
-         *
-         * @return The widget's parent container. NULL if the widget
-         *         has no parent.
-         * @since 0.1.0
-         */
-        virtual Widget* getParent() const A_WARN_UNUSED
-        { return mParent; }
-
-        /**
-         * Sets the width of the widget.
-         *
-         * @param width The width of the widget.
-         * @see getWidth, setHeight, getHeight, setSize,
-         *      setDimension, getDimensi
-         * @since 0.1.0
-         */
-        void setWidth(int width);
-
-        /**
-         * Gets the width of the widget.
-         *
-         * @return The width of the widget.
-         * @see setWidth, setHeight, getHeight, setSize,
-         *      setDimension, getDimension
-         * @since 0.1.0
-         */
-        int getWidth() const A_WARN_UNUSED
-        { return mDimension.width; }
-
-        /**
-         * Sets the height of the widget.
-         *
-         * @param height The height of the widget.
-         * @see getHeight, setWidth, getWidth, setSize,
-         *      setDimension, getDimension
-         * @since 0.1.0
-         */
-        void setHeight(int height);
-
-        /**
-         * Gets the height of the widget.
-         *
-         * @return The height of the widget.
-         * @see setHeight, setWidth, getWidth, setSize,
-         *      setDimension, getDimension
-         * @since 0.1.0
-         */
-        int getHeight() const A_WARN_UNUSED
-        { return mDimension.height; }
-
-        /**
-         * Sets the size of the widget.
-         *
-         * @param width The width of the widget.
-         * @param height The height of the widget.
-         * @see setWidth, setHeight, getWidth, getHeight,
-         *      setDimension, getDimension
-         * @since 0.1.0
-         */
-        void setSize(int width, int height);
-
-        /**
-         * Sets the x coordinate of the widget. The coordinate is
-         * relateive to the widget's parent.
-         *
-         * @param x The x coordinate of the widget.
-         * @see getX, setY, getY, setPosition, setDimension, getDimension
-         * @since 0.1.0
-         */
-        void setX(int x);
-
-        /**
-         * Gets the x coordinate of the widget. The coordinate is
-         * relative to the widget's parent.
-         *
-         * @return The x coordinate of the widget.
-         * @see setX, setY, getY, setPosition, setDimension, getDimension
-         * @since 0.1.0
-         */
-        int getX() const A_WARN_UNUSED
-        { return mDimension.x; }
-
-        /**
-         * Sets the y coordinate of the widget. The coordinate is
-         * relative to the widget's parent.
-         *
-         * @param y The y coordinate of the widget.
-         * @see setY, setX, getX, setPosition, setDimension, getDimension
-         * @since 0.1.0
-         */
-        void setY(int y);
-
-        /**
-         * Gets the y coordinate of the widget. The coordinate is
-         * relative to the widget's parent.
-         *
-         * @return The y coordinate of the widget.
-         * @see setY, setX, getX, setPosition, setDimension, getDimension
-         * @since 0.1.0
-         */
-        int getY() const A_WARN_UNUSED
-        { return mDimension.y; }
-
-        /**
-         * Sets position of the widget. The position is relative
-         * to the widget's parent.
-         *
-         * @param x The x coordinate of the widget.
-         * @param y The y coordinate of the widget.
-         * @see setX, getX, setY, getY, setDimension, getDimension
-         * @since 0.1.0
-         */
-        void setPosition(int x, int y);
-
-        /**
-         * Sets the dimension of the widget. The dimension is
-         * relative to the widget's parent.
-         *
-         * @param dimension The dimension of the widget.
-         * @see getDimension, setX, getX, setY, getY, setPosition
-         * @since 0.1.0
-         */
-        void setDimension(const Rectangle& dimension);
-
-        /**
-         * Gets the dimension of the widget. The dimension is
-         * relative to the widget's parent.
-         *
-         * @return The dimension of the widget.
-         * @see getDimension, setX, getX, setY, getY, setPosition
-         * @since 0.1.0
-         */
-        const Rectangle& getDimension() const A_WARN_UNUSED;
-
-        /**
-         * Sets the widget to be fosusable, or not.
-         *
-         * @param focusable True if the widget should be focusable,
-         *                  false otherwise.
-         * @see isFocusable
-         * @since 0.1.0
-         */
-        void setFocusable(bool focusable);
-
-         /**
-         * Checks if a widget is focsable.
-         *
-         * @return True if the widget should be focusable, false otherwise.
-         * @see setFocusable
-         * @since 0.1.0
-         */
-        bool isFocusable() const A_WARN_UNUSED;
-
-        /**
-         * Checks if the widget is focused.
-         *
-         * @return True if the widget is focused, false otherwise.
-         * @since 0.1.0
-         */
-        virtual bool isFocused() const A_WARN_UNUSED;
-
-        /**
-         * Sets the widget to enabled, or not. A disabled
-         * widget will never recieve mouse or key events.
-         *
-         * @param enabled True if widget should be enabled,
-         *                false otherwise.
-         * @see isEnabled
-         * @since 0.1.0
-         */
-        void setEnabled(bool enabled);
-
-        /**
-         * Checks if the widget is enabled. A disabled
-         * widget will never recieve mouse or key events.
-         *
-         * @return True if widget is enabled, false otherwise.
-         * @see setEnabled
-         * @since 0.1.0
-         */
-        bool isEnabled() const A_WARN_UNUSED;
-
-        /**
-         * Sets the widget to be visible, or not.
-         *
-         * @param visible True if widget should be visible, false otherwise.
-         * @see isVisible
-         * @since 0.1.0
-         */
-        void setVisible(bool visible);
-
-        /**
-         * Checks if the widget is visible.
-         *
-         * @return True if widget is be visible, false otherwise.
-         * @see setVisible
-         * @since 0.1.0
-         */
-        bool isVisible() const A_WARN_UNUSED
-        { return mVisible && (!mParent || mParent->isVisible()); }
-
-        /**
-         * Sets the base color of the widget.
-         *
-         * @param color The baseground color.
-         * @see getBaseColor
-         * @since 0.1.0
-         */
-        void setBaseColor(const Color& color);
-
-        /**
-         * Gets the base color.
-         *
-         * @return The base color.
-         * @see setBaseColor
-         * @since 0.1.0
-         */
-        const Color& getBaseColor() const A_WARN_UNUSED;
-
-        /**
-         * Sets the foreground color.
-         *
-         * @param color The foreground color.
-         * @see getForegroundColor
-         * @since 0.1.0
-         */
-        void setForegroundColor(const Color& color);
-
-        /**
-         * Gets the foreground color.
-         *
-         * @see setForegroundColor
-         * @since 0.1.0
-         */
-        const Color& getForegroundColor() const A_WARN_UNUSED;
-
-        /**
-         * Sets the background color.
-         *
-         * @param color The background Color.
-         * @see setBackgroundColor
-         * @since 0.1.0
-         */
-        void setBackgroundColor(const Color& color);
-
-        /**
-         * Gets the background color.
-         *
-         * @see setBackgroundColor
-         * @since 0.1.0
-         */
-        const Color& getBackgroundColor() const A_WARN_UNUSED;
-
-        /**
-         * Sets the selection color.
-         *
-         * @param color The selection color.
-         * @see getSelectionColor
-         * @since 0.6.0
-         */
-        void setSelectionColor(const Color& color);
-
-        /**
-         * Gets the selection color.
-         *
-         * @return The selection color.
-         * @see setSelectionColor
-         * @since 0.6.0
-         */
-        const Color& getSelectionColor() const A_WARN_UNUSED;
-
-        /**
-         * Requests focus for the widget. A widget will only recieve focus
-         * if it is focusable.
-         */
-        virtual void requestFocus();
-
-        /**
-         * Requests a move to the top in the parent widget.
-         */
-        virtual void requestMoveToTop();
-
-        /**
-         * Requests a move to the bottom in the parent widget.
-         */
-        virtual void requestMoveToBottom();
-
-        /**
-         * Sets the focus handler to be used.
-         *
-         * WARNING: This function is used internally and should not
-         *          be called or overloaded unless you know what you
-         *          are doing.
-         *
-         * @param focusHandler The focus handler to use.
-         * @see _getFocusHandler
-         * @since 0.1.0
-         */
-        virtual void _setFocusHandler(FocusHandler* focusHandler);
-
-        /**
-         * Gets the focus handler used.
-         *
-         * WARNING: This function is used internally and should not
-         *          be called or overloaded unless you know what you
-         *          are doing.
-         *
-         * @return The focus handler used.
-         * @see _setFocusHandler
-         * @since 0.1.0
-         */
-        virtual FocusHandler* _getFocusHandler() A_WARN_UNUSED;
-
-        /**
-         * Adds an action listener to the widget. When an action event 
-         * is fired by the widget the action listeners of the widget 
-         * will get notified.
-         *
-         * @param actionListener The action listener to add.
-         * @see removeActionListener
-         * @since 0.1.0
-         */
-        void addActionListener(ActionListener* actionListener);
-
-        /**
-         * Removes an added action listener from the widget.
-         *
-         * @param actionListener The action listener to remove.
-         * @see addActionListener
-         * @since 0.1.0
-         */
-        void removeActionListener(ActionListener* actionListener);
-
-        /**
-         * Adds a death listener to the widget. When a death event is 
-         * fired by the widget the death listeners of the widget will 
-         * get notified.
-         *
-         * @param deathListener The death listener to add.
-         * @see removeDeathListener
-         * @since 0.1.0
-         */
-        void addDeathListener(DeathListener* deathListener);
-
-        /**
-         * Removes an added death listener from the widget.
-         *
-         * @param deathListener The death listener to remove.
-         * @see addDeathListener
-         * @since 0.1.0
-         */
-        void removeDeathListener(DeathListener* deathListener);
-
-        /**
-         * Adds a mouse listener to the widget. When a mouse event is 
-         * fired by the widget the mouse listeners of the widget will 
-         * get notified.
-         *
-         * @param mouseListener The mouse listener to add.
-         * @see removeMouseListener
-         * @since 0.1.0
-         */
-        void addMouseListener(MouseListener* mouseListener);
-
-        /**
-         * Removes an added mouse listener from the widget.
-         *
-         * @param mouseListener The mouse listener to remove.
-         * @see addMouseListener
-         * @since 0.1.0
-         */
-        void removeMouseListener(MouseListener* mouseListener);
-
-        /**
-         * Adds a key listener to the widget. When a key event is 
-         * fired by the widget the key listeners of the widget will 
-         * get notified.
-         *
-         * @param keyListener The key listener to add.
-         * @see removeKeyListener
-         * @since 0.1.0
-         */
-        void addKeyListener(KeyListener* keyListener);
-
-        /**
-         * Removes an added key listener from the widget.
-         *
-         * @param keyListener The key listener to remove.
-         * @see addKeyListener
-         * @since 0.1.0
-         */
-        void removeKeyListener(KeyListener* keyListener);
-
-        /**
-         * Adds a focus listener to the widget. When a focus event is 
-         * fired by the widget the key listeners of the widget will 
-         * get notified.
-         *
-         * @param focusListener The focus listener to add.
-         * @see removeFocusListener
-         * @since 0.7.0
-         */
-        void addFocusListener(FocusListener* focusListener);
-
-        /**
-         * Removes an added focus listener from the widget.
-         *
-         * @param focusListener The focus listener to remove.
-         * @see addFocusListener
-         * @since 0.7.0
-         */
-        void removeFocusListener(FocusListener* focusListener);
-
-        /**
-         * Adds a widget listener to the widget. When a widget event is 
-         * fired by the widget the key listeners of the widget will 
-         * get notified.
-         *
-         * @param widgetListener The widget listener to add.
-         * @see removeWidgetListener
-         * @since 0.8.0
-         */
-        void addWidgetListener(WidgetListener* widgetListener);
-
-        /**
-         * Removes an added widget listener from the widget.
-         *
-         * @param widgetListener The widget listener to remove.
-         * @see addWidgetListener
-         * @since 0.8.0
-         */
-        void removeWidgetListener(WidgetListener* widgetListener);
-
-        /**
-         * Sets the action event identifier of the widget. The identifier is
-         * used to be able to identify which action has occured.
-         *
-         * NOTE: An action event identifier should not be used to identify a
-         *       certain widget but rather a certain event in your application.
-         *       Several widgets can have the same action event identifer.
-         *
-         * @param actionEventId The action event identifier.
-         * @see getActionEventId
-         * @since 0.6.0
-         */
-        void setActionEventId(const std::string& actionEventId);
-
-        /**
-         * Gets the action event identifier of the widget.
-         *
-         * @return The action event identifier of the widget.
-         * @see setActionEventId
-         * @since 0.6.0
-         */
-        const std::string& getActionEventId() const;
-
-        /**
-         * Gets the absolute position on the screen for the widget.
-         *
-         * @param x The absolute x coordinate will be stored in this parameter.
-         * @param y The absolute y coordinate will be stored in this parameter.
-         * @since 0.1.0
-         */
-        virtual void getAbsolutePosition(int& x, int& y) const;
-
-        /**
-         * Sets the parent of the widget. A parent must be a BasicContainer.
-         *
-         * WARNING: This function is used internally and should not
-         *          be called or overloaded unless you know what you
-         *          are doing.
-         *
-         * @param parent The parent of the widget.
-         * @see getParent
-         * @since 0.1.0
-         */
-        virtual void _setParent(Widget* parent);
-
-        /**
-         * Gets the font set for the widget. If no font has been set, 
-         * the global font will be returned. If no global font has been set, 
-         * the default font will be returend.
-         *
-         * @return The font set for the widget.
-         * @see setFont, setGlobalFont
-         * @since 0.1.0
-         */
-        Font *getFont() const A_WARN_UNUSED;
-
-        /**
-         * Sets the global font to be used by default for all widgets.
-         *
-         * @param font The global font.
-         * @see getGlobalFont
-         * @since 0.1.0
-         */
-        static void setGlobalFont(Font* font);
-
-        /**
-         * Sets the font for the widget. If NULL is passed, the global font 
-         * will be used.
-         *
-         * @param font The font to set for the widget.
-         * @see getFont
-         * @since 0.1.0
-         */
-        void setFont(Font* font);
-
-        /**
-         * Called when the font has changed. If the change is global,
-         * this function will only be called if the widget doesn't have a
-         * font already set.
-         *
-         * @since 0.1.0
-         */
-        virtual void fontChanged()
-        { }
-
-        /**
-         * Checks if a widget exists or not, that is if it still exists
-         * an instance of the object.
-         *
-         * @param widget The widget to check.
-         * @return True if an instance of the widget exists, false otherwise.
-         * @since 0.1.0
-         */
-        static bool widgetExists(const Widget* widget) A_WARN_UNUSED;
-
-        /**
-         * Checks if tab in is enabled. Tab in means that you can set focus
-         * to this widget by pressing the tab button. If tab in is disabled
-         * then the focus handler will skip this widget and focus the next
-         * in its focus order.
-         *
-         * @return True if tab in is enabled, false otherwise.
-         * @see setTabInEnabled
-         * @since 0.1.0
-         */
-        bool isTabInEnabled() const A_WARN_UNUSED;
-
-        /**
-         * Sets tab in enabled, or not. Tab in means that you can set focus
-         * to this widget by pressing the tab button. If tab in is disabled
-         * then the FocusHandler will skip this widget and focus the next
-         * in its focus order.
-         *
-         * @param enabled True if tab in should be enabled, false otherwise.
-         * @see isTabInEnabled
-         * @since 0.1.0
-         */
-        void setTabInEnabled(bool enabled);
-
-        /**
-         * Checks if tab out is enabled. Tab out means that you can lose
-         * focus to this widget by pressing the tab button. If tab out is
-         * disabled then the FocusHandler ignores tabbing and focus will
-         * stay with this widget.
-         *
-         * @return True if tab out is enabled, false otherwise.
-         * @see setTabOutEnabled
-         * @since 0.1.0
-         */
-        bool isTabOutEnabled() const A_WARN_UNUSED;
-
-        /**
-         * Sets tab out enabled. Tab out means that you can lose
-         * focus to this widget by pressing the tab button. If tab out is
-         * disabled then the FocusHandler ignores tabbing and focus will
-         * stay with this widget.
-         *
-         * @param enabled True if tab out should be enabled, false otherwise.
-         * @see isTabOutEnabled
-         * @since 0.1.0
-         */
-        void setTabOutEnabled(bool enabled);
-
-        /**
-         * Requests modal focus. When a widget has modal focus, only that
-         * widget and it's children may recieve input.
-         *
-         * @throws Exception if another widget already has modal focus.
-         * @see releaseModalFocus, isModalFocused
-         * @since 0.4.0
-         */
-        virtual void requestModalFocus();
-
-        /**
-         * Requests modal mouse input focus. When a widget has modal input focus
-         * that widget will be the only widget receiving input even if the input
-         * occurs outside of the widget and no matter what the input is.
-         *
-         * @throws Exception if another widget already has modal focus.
-         * @see releaseModalMouseInputFocus, isModalMouseInputFocused
-         * @since 0.6.0
-         */
-        virtual void requestModalMouseInputFocus();
-
-        /**
-         * Releases modal focus. Modal focus will only be released if the
-         * widget has modal focus.
-         *
-         * @see requestModalFocus, isModalFocused
-         * @since 0.4.0
-         */
-        virtual void releaseModalFocus();
-
-        /**
-         * Releases modal mouse input focus. Modal mouse input focus will only
-         * be released if the widget has modal mouse input focus.
-         *
-         * @see requestModalMouseInputFocus, isModalMouseInputFocused
-         * @since 0.6.0
-         */
-        virtual void releaseModalMouseInputFocus();
-
-        /**
-         * Checks if the widget or it's parent has modal focus.
-         *
-         * @return True if the widget has modal focus, false otherwise.
-         * @see requestModalFocus, releaseModalFocus
-         * @since 0.8.0
-         */
-        virtual bool isModalFocused() const A_WARN_UNUSED;
-
-        /**
-         * Checks if the widget or it's parent has modal mouse input focus.
-         *
-         * @return True if the widget has modal mouse input focus, false
-         *         otherwise.
-         * @see requestModalMouseInputFocus, releaseModalMouseInputFocus
-         * @since 0.8.0
-         */
-        virtual bool isModalMouseInputFocused() const A_WARN_UNUSED;
-
-        /**
-         * Gets a widget from a certain position in the widget.
-         * This function is used to decide which gets mouse input,
-         * thus it can be overloaded to change that behaviour.
-         *
-         * NOTE: This always returns NULL if the widget is not
-         *       a container.
-         *
-         * @param x The x coordinate of the widget to get.
-         * @param y The y coordinate of the widget to get.
-         * @return The widget at the specified coodinate, NULL
-         *         if no widget is found.
-         * @since 0.6.0
-         */
-        virtual Widget *getWidgetAt(int x, int y) A_WARN_UNUSED;
-
-        /**
-         * Gets the mouse listeners of the widget.
-         *
-         * @return The mouse listeners of the widget.
-         * @since 0.6.0
-         */
-        virtual const std::list<MouseListener*>& _getMouseListeners()
-                                                 A_WARN_UNUSED;
-
-        /**
-         * Gets the key listeners of the widget.
-         *
-         * @return The key listeners of the widget.
-         * @since 0.6.0
-         */
-        virtual const std::list<KeyListener*>& _getKeyListeners()
-                                               A_WARN_UNUSED;
-
-        /**
-         * Gets the focus listeners of the widget.
-         *
-         * @return The focus listeners of the widget.
-         * @since 0.7.0
-         */
-        virtual const std::list<FocusListener*>& _getFocusListeners()
-                                                 A_WARN_UNUSED;
-
-        /**
-         * Gets the area of the widget occupied by the widget's children.
-         * By default this method returns an empty rectangle as not all
-         * widgets are containers. If you want to make a container this
-         * method should return the area where the children resides. This
-         * method is used when drawing children of a widget when computing
-         * clip rectangles for the children.
-         *
-         * An example of a widget that overloads this method is ScrollArea.
-         * A ScrollArea has a view of its contant and that view is the
-         * children area. The size of a ScrollArea's children area might
-         * vary depending on if the scroll bars of the ScrollArea is shown
-         * or not.
-         *
-         * @return The area of the widget occupied by the widget's children.
-         * @see BasicContainer
-         * @see BasicContainer::getChildrenArea
-         * @see BasicContainer::drawChildren
-         * @since 0.1.0
-         */
-        virtual Rectangle getChildrenArea() A_WARN_UNUSED;
-
-        /**
-         * Gets the internal focus handler used.
-         *
-         * @return the internalFocusHandler used. If no internal focus handler
-         *         is used, NULL will be returned.
-         * @see setInternalFocusHandler
-         * @since 0.1.0
-         */
-        virtual FocusHandler* _getInternalFocusHandler() A_WARN_UNUSED;
-
-        /**
-         * Sets the internal focus handler. An internal focus handler is
-         * needed if both a widget in the widget and the widget itself
-         * should be foucsed at the same time.
-         *
-         * @param focusHandler The internal focus handler to be used.
-         * @see getInternalFocusHandler
-         * @since 0.1.0
-         */
-        void setInternalFocusHandler(FocusHandler* internalFocusHandler);
-
-        /**
-         * Moves a widget to the top of this widget. The moved widget will be
-         * drawn above all other widgets in this widget.
-         *
-         * @param widget The widget to move to the top.
-         * @see moveToBottom
-         * @since 0.1.0
-         */
-        virtual void moveToTop(Widget* widget A_UNUSED)
-        { }
-
-        /**
-         * Moves a widget in this widget to the bottom of this widget.
-         * The moved widget will be drawn below all other widgets in this widget.
-         *
-         * @param widget The widget to move to the bottom.
-         * @see moveToTop
-         * @since 0.1.0
-         */
-        virtual void moveToBottom(Widget* widget A_UNUSED)
-        { }
-
-        /**
-         * Focuses the next widget in the widget.
-         * 
-         * @see moveToBottom
-         * @since 0.1.0
-         */
-        virtual void focusNext()
-        { }
-
-        /**
-         * Focuses the previous widget in the widget.
-         *
-         * @see moveToBottom
-         * @since 0.1.0
-         */
-        virtual void focusPrevious()
-        { }
-
-        /**
-         * Tries to show a specific part of a widget by moving it. Used if the
-         * widget should act as a container.
-         *
-         * @param widget The target widget.
-         * @param area The area to show.
-         * @since 0.1.0
-         */
-        virtual void showWidgetPart(Widget* widget A_UNUSED,
-                                    Rectangle area A_UNUSED)
-        { }
-
-        /**
-         * Sets an id of a widget. An id can be useful if a widget needs to be
-         * identified in a container. For example, if widgets are created by an
-         * XML document, a certain widget can be retrieved given that the widget
-         * has an id.
-         *
-         * @param id The id to set to the widget.
-         * @see getId, BasicContainer::findWidgetById
-         * @since 0.8.0
-         */
-        void setId(const std::string& id);
-
-        /**
-         * Gets the id of a widget. An id can be useful if a widget needs to be
-         * identified in a container. For example, if widgets are created by an
-         * XML document, a certain widget can be retrieved given that the widget
-         * has an id.
-         *
-         * @param id The id to set to the widget.
-         * @see setId, BasicContainer::findWidgetById
-         * @since 0.8.0
-         */
-        const std::string& getId() A_WARN_UNUSED;
-
-        /**
-         * Shows a certain part of a widget in the widget's parent.
-         * Used when widgets want a specific part to be visible in
-         * its parent. An example is a TextArea that wants a specific
-         * part of its text to be visible when a TextArea is a child
-         * of a ScrollArea.
-         *
-         * @param rectangle The rectangle to be shown.
-         * @since 0.8.0
-         */
-        virtual void showPart(Rectangle rectangle);
-
-    protected:
-        /**
-         * Distributes an action event to all action listeners
-         * of the widget.
-         *
-         * @since 0.8.0
-         */
-        void distributeActionEvent();
-
-        /**
-         * Distributes resized events to all of the widget's listeners.
-         *
-         * @since 0.8.0
-         */
-        void distributeResizedEvent();
-
-        /**
-         * Distributes moved events to all of the widget's listeners.
-         *
-         * @since 0.8.0
-         */
-        void distributeMovedEvent();
-
-        /**
-         * Distributes hidden events to all of the widget's listeners.
-         *
-         * @since 0.8.0
-         * @author Olof Naessén
-         */
-        void distributeHiddenEvent();
-
-        /**
-         * Distributes shown events to all of the widget's listeners.
-         *
-         * @since 0.8.0
-         * @author Olof Naessén
-         */
-        void distributeShownEvent();
-
-        /**
-         * Typdef.
-         */
-        typedef std::list<MouseListener*> MouseListenerList;
-
-        /**
-         * Typdef.
-         */
-        typedef MouseListenerList::iterator MouseListenerIterator;
-
-        /**
-         * Holds the mouse listeners of the widget.
-         */
-        MouseListenerList mMouseListeners;
-
-        /**
-         * Typdef.
-         */
-        typedef std::list<KeyListener*> KeyListenerList;
-
-        /**
-         * Holds the key listeners of the widget.
-         */
-        KeyListenerList mKeyListeners;
-
-        /**
-         * Typdef.
-         */
-        typedef KeyListenerList::iterator KeyListenerIterator;
-
-        /**
-         * Typdef.
-         */
-        typedef std::list<ActionListener*> ActionListenerList;
-
-        /** 
-         * Holds the action listeners of the widget.
-         */
-        ActionListenerList mActionListeners;
-
-        /**
-         * Typdef.
-         */
-        typedef ActionListenerList::iterator ActionListenerIterator;
-
-        /**
-         * Typdef.
-         */
-        typedef std::list<DeathListener*> DeathListenerList;
-
-        /**
-         * Holds the death listeners of the widget.
-         */ 
-        DeathListenerList mDeathListeners;
-
-        /**
-         * Typdef.
-         */
-        typedef DeathListenerList::iterator DeathListenerIterator;
-
-        /**
-         * Typdef.
-         */
-        typedef std::list<FocusListener*> FocusListenerList;
-
-        /**
-         * Holds the focus listeners of the widget.
-         */
-        FocusListenerList mFocusListeners;
-
-        /**
-         * Typdef.
-         */
-        typedef FocusListenerList::iterator FocusListenerIterator;
-
-        typedef std::list<WidgetListener*> WidgetListenerList;
-
-        /**
-         * Holds the widget listeners of the widget.
-         */
-        WidgetListenerList mWidgetListeners;
-
-        /**
-         * Typdef.
-         */
-        typedef WidgetListenerList::iterator WidgetListenerIterator;
-
-        /**
-         * Holds the foreground color of the widget.
-         */
-        Color mForegroundColor;
-
-        /**
-         * Holds the background color of the widget.
-         */
-        Color mBackgroundColor;
-
-        /**
-         * Holds the base color of the widget.
-         */
-        Color mBaseColor;
-
-        /**
-         * Holds the selection color of the widget.
-         */
-        Color mSelectionColor;
-
-        /**
-         * Holds the focus handler used by the widget.
-         */
-        FocusHandler* mFocusHandler;
-
-        /**
-         * Holds the focus handler used by the widget. NULL
-         * if no internal focus handler is used.
-         */
-        FocusHandler* mInternalFocusHandler;
-
-        /**
-         * Holds the parent of the widget. NULL if the widget
-         * has no parent.
-         */
-        Widget* mParent;
-
-        /**
-         * Holds the dimension of the widget.
-         */
-        Rectangle mDimension;
-
-        /** 
-         * Holds the frame size of the widget.
-         */
-        unsigned int mFrameSize;
-
-        /**
-         * Holds the action event of the widget.
-         */
-        std::string mActionEventId;
-
-        /**
-         * True if the widget focusable, false otherwise.
-         */
-        bool mFocusable;
-
-        /**
-         * True if the widget visible, false otherwise.
-         */
-        bool mVisible;
-
-        /**
-         * True if the widget has tab in enabled, false otherwise.
-         */
-        bool mTabIn;
-
-        /**
-         * True if the widget has tab in enabled, false otherwise.
-         */
-        bool mTabOut;
-
-        /**
-         * True if the widget is enabled, false otherwise.
-         */
-        bool mEnabled;
-
-        /**
-         * Holds the id of the widget.
-         */
-        std::string mId;
-
-        /**
-         * Holds the font used by the widget.
-         */
-        Font* mCurrentFont;
-
-        /**
-         * Holds the global font used by the widget.
-         */
-        static Font* mGlobalFont;
-
-        /**
-         * Holds a list of all instances of widgets.
-         */
-        static std::list<Widget*> mWidgets;
-
-        static std::set<Widget*> mWidgetsSet;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_WIDGET_HPP
diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
deleted file mode 100644
index bf5dd2e7c..000000000
--- a/src/guichan/include/guichan/widgets/window.hpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_WINDOW_HPP
-#define GCN_WINDOW_HPP
-
-#include <string>
-
-#include "guichan/mouselistener.hpp"
-#include "guichan/widgets/container.hpp"
-
-namespace gcn
-{
-    /**
-     * An implementation of a movable window that can contain other widgets.
-     */
-    class Window : public Container,
-                   public MouseListener
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        Window();
-
-        /**
-         * Constructor. The window will be automatically resized in height
-         * to fit the caption.
-         *
-         * @param caption the caption of the window.
-         */
-        explicit Window(const std::string& caption);
-
-        A_DELETE_COPY(Window)
-
-        /**
-         * Destructor.
-         */
-        virtual ~Window();
-
-        /**
-         * Sets the caption of the window.
-         *
-         * @param caption The caption of the window.
-         * @see getCaption
-         */
-        void setCaption(const std::string& caption);
-
-        /**
-         * Gets the caption of the window.
-         *
-         * @return the caption of the window.
-         * @see setCaption
-         */
-        const std::string& getCaption() const;
-
-        /**
-         * Sets the alignment of the caption.
-         *
-         * @param alignment The alignment of the caption.
-         * @see getAlignment, Graphics
-         */
-        void setAlignment(Graphics::Alignment alignment);
-
-        /**
-         * Gets the alignment of the caption.
-         *
-         * @return The alignment of caption.
-         * @see setAlignment, Graphics
-         */
-        Graphics::Alignment getAlignment() const;
-
-        /**
-         * Sets the padding of the window. The padding is the distance between the
-         * window border and the content.
-         *
-         * @param padding The padding of the window.
-         * @see getPadding
-         */
-        void setPadding(unsigned int padding);
-
-        /**
-         * Gets the padding of the window. The padding is the distance between the
-         * window border and the content.
-         *
-         * @return The padding of the window.
-         * @see setPadding
-         */
-        unsigned int getPadding() const;
-
-        /**
-         * Sets the title bar height.
-         *
-         * @param height The title height value.
-         * @see getTitleBarHeight
-         */
-        void setTitleBarHeight(unsigned int height);
-
-        /**
-         * Gets the title bar height.
-         *
-         * @return The title bar height.
-         * @see setTitleBarHeight
-         */
-        unsigned int getTitleBarHeight();
-
-        /**
-         * Sets the window to be moveble or not.
-         *
-         * @param movable True if the window should be movable, false otherwise.
-         * @see isMovable
-         */
-        void setMovable(bool movable);
-
-        /**
-         * Checks if the window is movable.
-         *
-         * @return True if the window is movable, false otherwise.
-         * @see setMovable
-         */
-        bool isMovable() const;
-
-        /**
-         * Sets the window to be opaque or not. An opaque window will draw it's background
-         * and it's content. A non opaque window will only draw it's content.
-         *
-         * @param opaque True if the window should be opaque, false otherwise.
-         * @see isOpaque
-         */
-        void setOpaque(bool opaque);
-
-        /**
-         * Checks if the window is opaque.
-         *
-         * @return True if the window is opaque, false otherwise.
-         * @see setOpaque
-         */
-        bool isOpaque();
-
-        /**
-         * Resizes the window to fit the content.
-         */
-        virtual void resizeToContent();
-
-        // Inherited from BasicContainer
-
-        virtual Rectangle getChildrenArea();
-
-        // Inherited from MouseListener
-
-        virtual void mousePressed(MouseEvent& mouseEvent) override;
-
-        virtual void mouseDragged(MouseEvent& mouseEvent) override;
-
-        virtual void mouseReleased(MouseEvent& mouseEvent) override;
-
-    protected:
-        /**
-         * Holds the caption of the window.
-         */
-        std::string mCaption;
-
-        /**
-         * Holds the alignment of the caption.
-         */
-        Graphics::Alignment mAlignment;
-
-        /**
-         * Holds the padding of the window.
-         */ 
-        unsigned int mPadding;
-
-        /**
-         * Holds the title bar height of the window.
-         */
-        unsigned int mTitleBarHeight;
-
-        /**
-         * True if the window is movable, false otherwise.
-         */
-        bool mMovable;
-
-        /**
-         * True if the window is opaque, false otherwise.
-         */
-        bool mOpaque;
-
-        /**
-         * Holds a drag offset as an x coordinate where the drag of the window
-         * started if the window is being dragged. It's used to move the window 
-         * correctly when dragged.
-         */
-        int mDragOffsetX;
-
-        /**
-         * Holds a drag offset as an y coordinate where the drag of the window
-         * started if the window is being dragged. It's used to move the window 
-         * correctly when dragged.
-         */
-        int mDragOffsetY;
-
-        /**
-         * True if the window is being moved, false otherwise.
-         */
-        bool mMoved;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_WINDOW_HPP
diff --git a/src/guichan/inputevent.cpp b/src/guichan/inputevent.cpp
deleted file mode 100644
index ac7eea5bd..000000000
--- a/src/guichan/inputevent.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/inputevent.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    InputEvent::InputEvent(Widget *const source,
-                           const bool shiftPressed,
-                           const bool controlPressed,
-                           const bool altPressed,
-                           const bool metaPressed)
-            :Event(source),
-             mShiftPressed(shiftPressed),
-             mControlPressed(controlPressed),
-             mAltPressed(altPressed),
-             mMetaPressed(metaPressed),
-             mIsConsumed(false)
-    {
-    }
-
-    bool InputEvent::isShiftPressed() const
-    {
-        return mShiftPressed;
-    }
-
-    bool InputEvent::isControlPressed() const
-    {
-        return mControlPressed;
-    }
-
-    bool InputEvent::isAltPressed() const
-    {
-        return mAltPressed;
-    }
-
-    bool InputEvent::isMetaPressed() const
-    {
-        return mMetaPressed;
-    }
-
-    void InputEvent::consume()
-    {
-        mIsConsumed = true;
-    }
-
-    bool InputEvent::isConsumed() const
-    {
-        return mIsConsumed;
-    }
-}  // namespace gcn
diff --git a/src/guichan/keyevent.cpp b/src/guichan/keyevent.cpp
deleted file mode 100644
index 1f325ef1d..000000000
--- a/src/guichan/keyevent.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/keyevent.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    KeyEvent::KeyEvent(Widget *const source,
-                       const bool shiftPressed,
-                       const bool controlPressed,
-                       const bool altPressed,
-                       const bool metaPressed,
-                       const unsigned int type,
-                       const bool numericPad,
-                       const Key& key) :
-        InputEvent(source,
-                   shiftPressed,
-                   controlPressed,
-                   altPressed,
-                   metaPressed),
-        mType(type),
-        mIsNumericPad(numericPad),
-        mKey(key)
-    {
-    }
-
-    KeyEvent::~KeyEvent()
-    {
-    }
-
-    unsigned int KeyEvent::getType() const
-    {
-        return mType;
-    }
-
-    bool KeyEvent::isNumericPad() const
-    {
-        return mIsNumericPad;
-    }
-
-    const Key& KeyEvent::getKey() const
-    {
-        return mKey;
-    }
-}  // namespace gcn
diff --git a/src/guichan/mouseevent.cpp b/src/guichan/mouseevent.cpp
deleted file mode 100644
index c24be1252..000000000
--- a/src/guichan/mouseevent.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/mouseevent.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    MouseEvent::MouseEvent(Widget *const source,
-                           const bool shiftPressed,
-                           const bool controlPressed,
-                           const bool altPressed,
-                           const bool metaPressed,
-                           const unsigned int type,
-                           const unsigned int button,
-                           const int x,
-                           const int y,
-                           const int clickCount) :
-        InputEvent(source,
-                   shiftPressed,
-                   controlPressed,
-                   altPressed,
-                   metaPressed),
-        mType(type),
-        mButton(button),
-        mX(x),
-        mY(y),
-        mClickCount(clickCount)
-    {
-    }
-
-    unsigned int MouseEvent::getButton() const
-    {
-        return mButton;
-    }
-
-    int MouseEvent::getX() const
-    {
-        return mX;
-    }
-
-    int MouseEvent::getY() const
-    {
-        return mY;
-    }
-
-    int MouseEvent::getClickCount() const
-    {
-        return mClickCount;
-    }
-
-    unsigned int MouseEvent::getType() const
-    {
-        return mType;
-    }
-}  // namespace gcn
diff --git a/src/guichan/rectangle.cpp b/src/guichan/rectangle.cpp
deleted file mode 100644
index 3aca53a0a..000000000
--- a/src/guichan/rectangle.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/rectangle.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    Rectangle::Rectangle()
-        : x(0),
-          y(0),
-          width(0),
-          height(0)
-    {
-    }
-
-    Rectangle::Rectangle(const int x_, const int y_,
-                         const int width_, const int height_) :
-        x(x_),
-        y(y_),
-        width(width_),
-        height(height_)
-    {
-    }
-
-    void Rectangle::setAll(int x_, int y_, int width_, int height_)
-    {
-        x = x_;
-        y = y_;
-        width = width_;
-        height = height_;
-    }
-
-    bool Rectangle::isIntersecting(const Rectangle& rectangle) const
-    {
-        int x_ = x;
-        int y_ = y;
-        int width_ = width;
-        int height_ = height;
-
-        x_ -= rectangle.x;
-        y_ -= rectangle.y;
-
-        if (x_ < 0)
-        {
-            width_ += x_;
-//            x_ = 0;
-        }
-        else if (x_ + width_ > rectangle.width)
-        {
-            width_ = rectangle.width - x_;
-        }
-
-        if (y_ < 0)
-        {
-            height_ += y_;
-//            y_ = 0;
-        }
-        else if (y_ + height_ > rectangle.height)
-        {
-            height_ = rectangle.height - y_;
-        }
-
-        if (width_ <= 0 || height_ <= 0)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool Rectangle::isPointInRect(int x_, int y_) const
-    {
-        return x_ >= x
-            && y_ >= y
-            && x_ < x + width
-            && y_ < y + height;
-    }
-
-    std::ostream& operator<<(std::ostream& out,
-                             const Rectangle& rectangle)
-    {
-        out << "Rectangle [x = " << rectangle.x
-            << ", y = " << rectangle.y
-            << ", width = " << rectangle.width
-            << ", height = " << rectangle.height
-            << "]";
-
-        return out;
-    }
-}  // namespace gcn
diff --git a/src/guichan/selectionevent.cpp b/src/guichan/selectionevent.cpp
deleted file mode 100644
index 2606d84ef..000000000
--- a/src/guichan/selectionevent.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/selectionevent.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    SelectionEvent::SelectionEvent(Widget *const source) :
-        Event(source)
-    {
-    }
-
-    SelectionEvent::~SelectionEvent()
-    {
-    }
-}  // namespace gcn
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp
deleted file mode 100644
index 0cd7883d7..000000000
--- a/src/guichan/widget.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/widget.hpp"
-
-#include "guichan/actionevent.hpp"
-#include "guichan/actionlistener.hpp"
-#include "guichan/basiccontainer.hpp"
-#include "guichan/deathlistener.hpp"
-#include "guichan/event.hpp"
-#include "guichan/exception.hpp"
-#include "guichan/focushandler.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/keyinput.hpp"
-#include "guichan/keylistener.hpp"
-#include "guichan/mouseinput.hpp"
-#include "guichan/mouselistener.hpp"
-#include "guichan/widgetlistener.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    Font* Widget::mGlobalFont = nullptr;
-    std::list<Widget*> Widget::mWidgets;
-    std::set<Widget*> Widget::mWidgetsSet;
-
-    Widget::Widget() :
-        mMouseListeners(),
-        mKeyListeners(),
-        mActionListeners(),
-        mDeathListeners(),
-        mFocusListeners(),
-        mWidgetListeners(),
-        mForegroundColor(0x000000),
-        mBackgroundColor(0xffffff),
-        mBaseColor(0x808090),
-        mSelectionColor(0xc3d9ff),
-        mFocusHandler(nullptr),
-        mInternalFocusHandler(nullptr),
-        mParent(nullptr),
-        mDimension(),
-        mFrameSize(0),
-        mActionEventId(),
-        mFocusable(false),
-        mVisible(true),
-        mTabIn(true),
-        mTabOut(true),
-        mEnabled(true),
-        mId(),
-        mCurrentFont(nullptr)
-    {
-        mWidgets.push_back(this);
-        mWidgetsSet.insert(this);
-    }
-
-    Widget::~Widget()
-    {
-        for (DeathListenerIterator iter = mDeathListeners.begin();
-             iter != mDeathListeners.end();
-             ++iter)
-        {
-            Event event(this);
-            (*iter)->death(event);
-        }
-
-        _setFocusHandler(nullptr);
-
-        mWidgets.remove(this);
-        mWidgetsSet.erase(this);
-    }
-
-    void Widget::drawFrame(Graphics* graphics)
-    {
-        BLOCK_START("Widget::drawFrame")
-        const Color &faceColor = getBaseColor();
-        Color highlightColor = faceColor + Color(0x303030);
-        Color shadowColor = faceColor - Color(0x303030);
-        const int alpha = getBaseColor().a;
-        const int width = getWidth() + getFrameSize() * 2 - 1;
-        const int height = getHeight() + getFrameSize() * 2 - 1;
-        highlightColor.a = alpha;
-        shadowColor.a = alpha;
-
-        for (unsigned int i = 0; i < getFrameSize(); ++i)
-        {
-            graphics->setColor(shadowColor);
-            graphics->drawLine(i, i, width - i, i);
-            graphics->drawLine(i, i + 1, i, height - i - 1);
-            graphics->setColor(highlightColor);
-            graphics->drawLine(width - i, i + 1, width - i, height - i);
-            graphics->drawLine(i, height - i, width - i - 1, height - i);
-        }
-        BLOCK_END("Widget::drawFrame")
-    }
-
-    void Widget::_setParent(Widget* parent)
-    {
-        mParent = parent;
-    }
-
-    void Widget::setWidth(int width)
-    {
-        Rectangle newDimension = mDimension;
-        newDimension.width = width;
-
-        setDimension(newDimension);
-    }
-
-    void Widget::setHeight(int height)
-    {
-        Rectangle newDimension = mDimension;
-        newDimension.height = height;
-
-        setDimension(newDimension);
-    }
-
-    void Widget::setX(int x)
-    {
-        Rectangle newDimension = mDimension;
-        newDimension.x = x;
-
-        setDimension(newDimension);
-    }
-
-    void Widget::setY(int y)
-    {
-        Rectangle newDimension = mDimension;
-        newDimension.y = y;
-
-        setDimension(newDimension);
-    }
-
-    void Widget::setPosition(int x, int y)
-    {
-        Rectangle newDimension = mDimension;
-        newDimension.x = x;
-        newDimension.y = y;
-
-        setDimension(newDimension);
-    }
-
-    void Widget::setDimension(const Rectangle& dimension)
-    {
-        const Rectangle oldDimension = mDimension;
-        mDimension = dimension;
-
-        if (mDimension.width != oldDimension.width
-            || mDimension.height != oldDimension.height)
-        {
-            distributeResizedEvent();
-        }
-
-        if (mDimension.x != oldDimension.x
-            || mDimension.y != oldDimension.y)
-        {
-            distributeMovedEvent();
-        }
-    }
-
-    void Widget::setFrameSize(unsigned int frameSize)
-    {
-        mFrameSize = frameSize;
-    }
-
-    unsigned int Widget::getFrameSize() const
-    {
-        return mFrameSize;
-    }
-
-    const Rectangle& Widget::getDimension() const
-    {
-        return mDimension;
-    }
-
-    const std::string& Widget::getActionEventId() const
-    {
-        return mActionEventId;
-    }
-
-    void Widget::setActionEventId(const std::string& actionEventId)
-    {
-        mActionEventId = actionEventId;
-    }
-
-    bool Widget::isFocused() const
-    {
-        if (!mFocusHandler)
-            return false;
-
-        return (mFocusHandler->isFocused(this));
-    }
-
-    void Widget::setFocusable(bool focusable)
-    {
-        if (!focusable && isFocused())
-        {
-            mFocusHandler->focusNone();
-        }
-
-        mFocusable = focusable;
-    }
-
-    bool Widget::isFocusable() const
-    {
-        return mFocusable && isVisible() && isEnabled();
-    }
-
-    void Widget::requestFocus()
-    {
-        if (!mFocusHandler)
-        {
-            throw GCN_EXCEPTION("No focushandler set (did you add "
-                "the widget to the gui?).");
-        }
-
-        if (isFocusable())
-            mFocusHandler->requestFocus(this);
-    }
-
-    void Widget::requestMoveToTop()
-    {
-        if (mParent)
-            mParent->moveToTop(this);
-    }
-
-    void Widget::requestMoveToBottom()
-    {
-        if (mParent)
-            mParent->moveToBottom(this);
-    }
-
-    void Widget::setVisible(bool visible)
-    {
-        if (!visible && isFocused())
-            mFocusHandler->focusNone();
-
-        if (visible)
-            distributeShownEvent();
-        else
-            distributeHiddenEvent();
-
-        mVisible = visible;
-    }
-
-    void Widget::setBaseColor(const Color& color)
-    {
-        mBaseColor = color;
-    }
-
-    const Color& Widget::getBaseColor() const
-    {
-        return mBaseColor;
-    }
-
-    void Widget::setForegroundColor(const Color& color)
-    {
-        mForegroundColor = color;
-    }
-
-    const Color& Widget::getForegroundColor() const
-    {
-        return mForegroundColor;
-    }
-
-    void Widget::setBackgroundColor(const Color& color)
-    {
-        mBackgroundColor = color;
-    }
-
-    const Color& Widget::getBackgroundColor() const
-    {
-        return mBackgroundColor;
-    }
-
-    void Widget::setSelectionColor(const Color& color)
-    {
-        mSelectionColor = color;
-    }
-
-    const Color& Widget::getSelectionColor() const
-    {
-        return mSelectionColor;
-    }
-
-    void Widget::_setFocusHandler(FocusHandler* focusHandler)
-    {
-        if (mFocusHandler)
-        {
-            releaseModalFocus();
-            mFocusHandler->remove(this);
-        }
-
-        if (focusHandler)
-            focusHandler->add(this);
-
-        mFocusHandler = focusHandler;
-    }
-
-    FocusHandler* Widget::_getFocusHandler()
-    {
-        return mFocusHandler;
-    }
-
-    void Widget::addActionListener(ActionListener* actionListener)
-    {
-        mActionListeners.push_back(actionListener);
-    }
-
-    void Widget::removeActionListener(ActionListener* actionListener)
-    {
-        mActionListeners.remove(actionListener);
-    }
-
-    void Widget::addDeathListener(DeathListener* deathListener)
-    {
-        mDeathListeners.push_back(deathListener);
-    }
-
-    void Widget::removeDeathListener(DeathListener* deathListener)
-    {
-        mDeathListeners.remove(deathListener);
-    }
-
-    void Widget::addKeyListener(KeyListener* keyListener)
-    {
-        mKeyListeners.push_back(keyListener);
-    }
-
-    void Widget::removeKeyListener(KeyListener* keyListener)
-    {
-        mKeyListeners.remove(keyListener);
-    }
-
-    void Widget::addFocusListener(FocusListener* focusListener)
-    {
-        mFocusListeners.push_back(focusListener);
-    }
-
-    void Widget::removeFocusListener(FocusListener* focusListener)
-    {
-        mFocusListeners.remove(focusListener);
-    }
-
-    void Widget::addMouseListener(MouseListener* mouseListener)
-    {
-        mMouseListeners.push_back(mouseListener);
-    }
-
-    void Widget::removeMouseListener(MouseListener* mouseListener)
-    {
-        mMouseListeners.remove(mouseListener);
-    }
-
-    void Widget::addWidgetListener(WidgetListener* widgetListener)
-    {
-        mWidgetListeners.push_back(widgetListener);
-    }
-
-    void Widget::removeWidgetListener(WidgetListener* widgetListener)
-    {
-        mWidgetListeners.remove(widgetListener);
-    }
-
-    void Widget::getAbsolutePosition(int& x, int& y) const
-    {
-        if (!mParent)
-        {
-            x = mDimension.x;
-            y = mDimension.y;
-            return;
-        }
-
-        int parentX;
-        int parentY;
-
-        mParent->getAbsolutePosition(parentX, parentY);
-
-        const Rectangle &rect = mParent->getChildrenArea();
-        x = parentX + mDimension.x + rect.x;
-        y = parentY + mDimension.y + rect.y;
-    }
-
-    Font* Widget::getFont() const
-    {
-        if (!mCurrentFont)
-            return mGlobalFont;
-        return mCurrentFont;
-    }
-
-    void Widget::setGlobalFont(Font* font)
-    {
-        mGlobalFont = font;
-
-        for (std::list<Widget*>::const_iterator iter = mWidgets.begin();
-             iter != mWidgets.end(); ++iter)
-        {
-            if (!(*iter)->mCurrentFont)
-                (*iter)->fontChanged();
-        }
-    }
-
-    void Widget::setFont(Font* font)
-    {
-        mCurrentFont = font;
-        fontChanged();
-    }
-
-    bool Widget::widgetExists(const Widget* widget)
-    {
-        return mWidgetsSet.find(const_cast<Widget*>(widget))
-            != mWidgetsSet.end();
-    }
-
-    bool Widget::isTabInEnabled() const
-    {
-        return mTabIn;
-    }
-
-    void Widget::setTabInEnabled(bool enabled)
-    {
-        mTabIn = enabled;
-    }
-
-    bool Widget::isTabOutEnabled() const
-    {
-        return mTabOut;
-    }
-
-    void Widget::setTabOutEnabled(bool enabled)
-    {
-        mTabOut = enabled;
-    }
-
-    void Widget::setSize(int width, int height)
-    {
-        Rectangle newDimension = mDimension;
-        newDimension.width = width;
-        newDimension.height = height;
-
-        setDimension(newDimension);
-    }
-
-    void Widget::setEnabled(bool enabled)
-    {
-        mEnabled = enabled;
-    }
-
-    bool Widget::isEnabled() const
-    {
-        return mEnabled && isVisible();
-    }
-
-    void Widget::requestModalFocus()
-    {
-        if (!mFocusHandler)
-        {
-            throw GCN_EXCEPTION("No focushandler set (did you add "
-                "the widget to the gui?).");
-        }
-
-        mFocusHandler->requestModalFocus(this);
-    }
-
-    void Widget::requestModalMouseInputFocus()
-    {
-        if (!mFocusHandler)
-        {
-            throw GCN_EXCEPTION("No focushandler set (did you add "
-                "the widget to the gui?).");
-        }
-
-        mFocusHandler->requestModalMouseInputFocus(this);
-    }
-
-    void Widget::releaseModalFocus()
-    {
-        if (!mFocusHandler)
-            return;
-
-        mFocusHandler->releaseModalFocus(this);
-    }
-
-    void Widget::releaseModalMouseInputFocus()
-    {
-        if (!mFocusHandler)
-            return;
-
-        mFocusHandler->releaseModalMouseInputFocus(this);
-    }
-
-    bool Widget::isModalFocused() const
-    {
-        if (!mFocusHandler)
-        {
-            throw GCN_EXCEPTION("No focushandler set (did you add "
-                "the widget to the gui?).");
-        }
-
-        if (mParent)
-        {
-            return (mFocusHandler->getModalFocused() == this)
-                || mParent->isModalFocused();
-        }
-
-        return mFocusHandler->getModalFocused() == this;
-    }
-
-    bool Widget::isModalMouseInputFocused() const
-    {
-        if (!mFocusHandler)
-        {
-            throw GCN_EXCEPTION("No focushandler set (did you add "
-                "the widget to the gui?).");
-        }
-
-        if (mParent)
-        {
-            return (mFocusHandler->getModalMouseInputFocused() == this)
-                || mParent->isModalMouseInputFocused();
-        }
-
-        return mFocusHandler->getModalMouseInputFocused() == this;
-    }
-
-    Widget *Widget::getWidgetAt(int x A_UNUSED, int y A_UNUSED)
-    {
-        return nullptr;
-    }
-
-    const std::list<MouseListener*>& Widget::_getMouseListeners()
-    {
-        return mMouseListeners;
-    }
-
-    const std::list<KeyListener*>& Widget::_getKeyListeners()
-    {
-        return mKeyListeners;
-    }
-
-    const std::list<FocusListener*>& Widget::_getFocusListeners()
-    {
-        return mFocusListeners;
-    }
-
-    Rectangle Widget::getChildrenArea()
-    {
-        return Rectangle(0, 0, 0, 0);
-    }
-
-    FocusHandler* Widget::_getInternalFocusHandler()
-    {
-        return mInternalFocusHandler;
-    }
-
-    void Widget::setInternalFocusHandler(FocusHandler* focusHandler)
-    {
-        mInternalFocusHandler = focusHandler;
-    }
-
-    void Widget::setId(const std::string& id)
-    {
-        mId = id;
-    }
-
-    const std::string& Widget::getId()
-    {
-        return mId;
-    }
-
-    void Widget::distributeResizedEvent()
-    {
-        for (WidgetListenerIterator iter = mWidgetListeners.begin();
-             iter != mWidgetListeners.end();
-             ++ iter)
-        {
-            Event event(this);
-            (*iter)->widgetResized(event);
-        }
-    }
-
-    void Widget::distributeMovedEvent()
-    {
-        for (WidgetListenerIterator iter = mWidgetListeners.begin();
-             iter != mWidgetListeners.end();
-             ++ iter)
-        {
-            Event event(this);
-            (*iter)->widgetMoved(event);
-        }
-    }
-
-    void Widget::distributeHiddenEvent()
-    {
-        for (WidgetListenerIterator iter = mWidgetListeners.begin();
-             iter != mWidgetListeners.end();
-             ++ iter)
-        {
-            Event event(this);
-            (*iter)->widgetHidden(event);
-        }
-    }
-
-    void Widget::distributeActionEvent()
-    {
-        for (ActionListenerIterator iter = mActionListeners.begin();
-             iter != mActionListeners.end();
-             ++iter)
-        {
-            ActionEvent actionEvent(this, mActionEventId);
-            (*iter)->action(actionEvent);
-        }
-    }
-
-    void Widget::distributeShownEvent()
-    {
-        for (WidgetListenerIterator iter = mWidgetListeners.begin();
-             iter != mWidgetListeners.end();
-             ++iter)
-        {
-            Event event(this);
-            (*iter)->widgetShown(event);
-        }
-    }
-
-    void Widget::showPart(Rectangle rectangle)
-    {
-        if (mParent)
-            mParent->showWidgetPart(this, rectangle);
-    }
-}  // namespace gcn
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
deleted file mode 100644
index 8865444e0..000000000
--- a/src/guichan/widgets/window.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/widgets/window.hpp"
-
-#include "guichan/exception.hpp"
-#include "guichan/font.hpp"
-#include "guichan/graphics.hpp"
-#include "guichan/mouseinput.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    Window::Window() :
-        Container(),
-        gcn::MouseListener(),
-        mCaption(),
-        mAlignment(Graphics::CENTER),
-        mPadding(2),
-        mTitleBarHeight(16),
-        mMovable(true),
-        mOpaque(true),
-        mDragOffsetX(0),
-        mDragOffsetY(0),
-        mMoved(false)
-    {
-        mFrameSize = 1;
-        addMouseListener(this);
-    }
-
-    Window::Window(const std::string& caption) :
-        Container(),
-        gcn::MouseListener(),
-        mCaption(caption),
-        mAlignment(Graphics::CENTER),
-        mPadding(2),
-        mTitleBarHeight(16),
-        mMovable(true),
-        mOpaque(true),
-        mDragOffsetX(0),
-        mDragOffsetY(0),
-        mMoved(false)
-    {
-        mFrameSize = 1;
-        addMouseListener(this);
-    }
-
-    Window::~Window()
-    {
-    }
-
-    void Window::setPadding(unsigned int padding)
-    {
-        mPadding = padding;
-    }
-
-    unsigned int Window::getPadding() const
-    {
-        return mPadding;
-    }
-
-    void Window::setTitleBarHeight(unsigned int height)
-    {
-        mTitleBarHeight = height;
-    }
-
-    unsigned int Window::getTitleBarHeight()
-    {
-        return mTitleBarHeight;
-    }
-
-    void Window::setCaption(const std::string& caption)
-    {
-        mCaption = caption;
-    }
-
-    const std::string& Window::getCaption() const
-    {
-        return mCaption;
-    }
-
-    void Window::setAlignment(Graphics::Alignment alignment)
-    {
-        mAlignment = alignment;
-    }
-
-    Graphics::Alignment Window::getAlignment() const
-    {
-        return mAlignment;
-    }
-
-    void Window::mousePressed(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.getSource() != this)
-            return;
-
-        if (getParent())
-            getParent()->moveToTop(this);
-
-        mDragOffsetX = mouseEvent.getX();
-        mDragOffsetY = mouseEvent.getY();
-
-        mMoved = mouseEvent.getY() <= static_cast<int>(mTitleBarHeight);
-    }
-
-    void Window::mouseReleased(MouseEvent& mouseEvent A_UNUSED)
-    {
-        mMoved = false;
-    }
-
-    void Window::mouseDragged(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.isConsumed() || mouseEvent.getSource() != this)
-            return;
-
-        if (isMovable() && mMoved)
-        {
-            setPosition(mouseEvent.getX() - mDragOffsetX + getX(),
-                        mouseEvent.getY() - mDragOffsetY + getY());
-        }
-
-        mouseEvent.consume();
-    }
-
-    Rectangle Window::getChildrenArea()
-    {
-        return Rectangle(getPadding(),
-                         getTitleBarHeight(),
-                         getWidth() - getPadding() * 2,
-                         getHeight() - getPadding() - getTitleBarHeight());
-    }
-
-    void Window::setMovable(bool movable)
-    {
-        mMovable = movable;
-    }
-
-    bool Window::isMovable() const
-    {
-        return mMovable;
-    }
-
-    void Window::setOpaque(bool opaque)
-    {
-        mOpaque = opaque;
-    }
-
-    bool Window::isOpaque()
-    {
-        return mOpaque;
-    }
-
-    void Window::resizeToContent()
-    {
-        int w = 0, h = 0;
-        for (WidgetListConstIterator it = mWidgets.begin();
-             it != mWidgets.end(); ++ it)
-        {
-            if ((*it)->getX() + (*it)->getWidth() > w)
-                w = (*it)->getX() + (*it)->getWidth();
-
-            if ((*it)->getY() + (*it)->getHeight() > h)
-                h = (*it)->getY() + (*it)->getHeight();
-        }
-
-        setSize(w + 2* getPadding(), h + getPadding() + getTitleBarHeight());
-    }
-}  // namespace gcn
diff --git a/src/guild.h b/src/guild.h
index 48b3d17b2..6206271e0 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -25,7 +25,7 @@
 
 #include "avatar.h"
 
-#include "gui/widgets/avatarlistbox.h"
+#include "gui/models/avatarlistmodel.h"
 
 #include "utils/dtor.h"
 #include "utils/stringvector.h"
diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp
index c40e49856..965c333bf 100644
--- a/src/imagesprite.cpp
+++ b/src/imagesprite.cpp
@@ -56,5 +56,5 @@ void ImageSprite::draw(Graphics *const graphics,
         return;
 
     mImage->setAlpha(mAlpha);
-    graphics->drawImage2(mImage, posX, posY);
+    graphics->drawImage(mImage, posX, posY);
 }
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index cc37001cc..5d157f0fa 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -28,7 +28,6 @@
 #include "input/keyboardconfig.h"
 #include "input/keyboarddata.h"
 #include "being/localplayer.h"
-#include "being/playerinfo.h"
 #ifdef USE_SDL2
 #include "input/multitouchmanager.h"
 #endif
@@ -47,12 +46,10 @@
 #include "gui/windows/setupwindow.h"
 #include "gui/windows/textdialog.h"
 #include "gui/windows/tradewindow.h"
-#include "gui/windows/quitdialog.h"
 
 #include "utils/timer.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
+#include "gui/focushandler.h"
 
 #include <algorithm>
 
@@ -60,6 +57,8 @@
 
 InputManager inputManager;
 
+class QuitDialog;
+
 extern QuitDialog *quitDialog;
 
 static class KeyFunctor final
@@ -549,18 +548,10 @@ bool InputManager::handleEvent(const SDL_Event &event)
             if (quitDialog || TextDialog::isActive() ||
                 NpcPostDialog::isActive())
             {
-                try
-                {
-                    if (guiInput)
-                        guiInput->pushInput(event);
-                    if (gui)
-                        gui->handleInput();
-                }
-                catch(const gcn::Exception &e)
-                {
-                    const char *const err = e.getMessage().c_str();
-                    logger->log("Warning: guichan input exception: %s", err);
-                }
+                if (guiInput)
+                    guiInput->pushInput(event);
+                if (gui)
+                    gui->handleInput();
                 return true;
             }
             break;
@@ -605,16 +596,8 @@ bool InputManager::handleEvent(const SDL_Event &event)
             break;
     }
 
-    try
-    {
-        if (guiInput)
-            guiInput->pushInput(event);
-    }
-    catch(const gcn::Exception &e)
-    {
-        const char *const err = e.getMessage().c_str();
-        logger->log("Warning: guichan input exception: %s", err);
-    }
+    if (guiInput)
+        guiInput->pushInput(event);
     if (gui)
     {
         const bool res = gui->handleInput();
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index 630b52948..fcd1252c0 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -21,7 +21,8 @@
 #ifndef INPUT_INPUTMANAGER_H
 #define INPUT_INPUTMANAGER_H
 
-#include "input/inputevent.h"
+#include "events/inputevent.h"
+
 #include "input/keydata.h"
 
 #include <string>
diff --git a/src/input/joystick.h b/src/input/joystick.h
index 06823ca27..8693d0d75 100644
--- a/src/input/joystick.h
+++ b/src/input/joystick.h
@@ -23,7 +23,7 @@
 #ifndef INPUT_JOYSTICK_H
 #define INPUT_JOYSTICK_H
 
-#include "input/inputevent.h"
+#include "events/inputevent.h"
 
 #include <SDL_events.h>
 
diff --git a/src/guichan/key.cpp b/src/input/key.cpp
index 24d817fdb..13d2a301d 100644
--- a/src/guichan/key.cpp
+++ b/src/input/key.cpp
@@ -65,49 +65,46 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "guichan/key.hpp"
+#include "input/key.h"
 
 #include "debug.h"
 
-namespace gcn
+Key::Key(const int value) :
+    mValue(value)
 {
-    Key::Key(const int value) :
-        mValue(value)
-    {
-    }
+}
 
-    bool Key::isCharacter() const
-    {
-        return (mValue >= 32 && mValue <= 126)
-            || (mValue >= 162 && mValue <= 255)
-            || (mValue == 9);
-    }
+bool Key::isCharacter() const
+{
+    return (mValue >= 32 && mValue <= 126)
+        || (mValue >= 162 && mValue <= 255)
+        || (mValue == 9);
+}
 
-    bool Key::isNumber() const
-    {
-        return mValue >= 48 && mValue <= 57;
-    }
+bool Key::isNumber() const
+{
+    return mValue >= 48 && mValue <= 57;
+}
 
-    bool Key::isLetter() const
-    {
-        return (((mValue >= 65 && mValue <= 90)
-                || (mValue >= 97 && mValue <= 122)
-                || (mValue >= 192 && mValue <= 255))
-                && (mValue != 215) && (mValue != 247));
-    }
+bool Key::isLetter() const
+{
+    return (((mValue >= 65 && mValue <= 90)
+            || (mValue >= 97 && mValue <= 122)
+            || (mValue >= 192 && mValue <= 255))
+            && (mValue != 215) && (mValue != 247));
+}
 
-    int Key::getValue() const
-    {
-        return mValue;
-    }
+int Key::getValue() const
+{
+    return mValue;
+}
 
-    bool Key::operator==(const Key& key) const
-    {
-        return mValue == key.mValue;
-    }
+bool Key::operator==(const Key& key) const
+{
+    return mValue == key.mValue;
+}
 
-    bool Key::operator!=(const Key& key) const
-    {
-        return (mValue != key.mValue);
-    }
-}  // namespace gcn
+bool Key::operator!=(const Key& key) const
+{
+    return (mValue != key.mValue);
+}
diff --git a/src/guichan/include/guichan/key.hpp b/src/input/key.h
index 46b36a179..97bc7113d 100644
--- a/src/guichan/include/guichan/key.hpp
+++ b/src/input/key.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_KEY_HPP
-#define GCN_KEY_HPP
+#ifndef INPUT_KEY_H
+#define INPUT_KEY_H
 
 #include "localconsts.h"
 
@@ -73,78 +73,26 @@
 #undef DELETE
 #endif
 
-namespace gcn
+/**
+  * Represents a key or a character.
+  */
+class Key final
 {
-    /**
-     * Represents a key or a character.
-     */
-    class Key final
-    {
     public:
         /**
-         * Constructor.
-         *
-         * @param value The ascii or enum value for the key.
-         */
+          * Constructor.
+          *
+          * @param value The ascii or enum value for the key.
+          */
         explicit Key(const int value = 0);
 
-        /**
-         * Checks if a key is a character.
-         *
-         * @return True if the key is a letter, number or whitespace,
-         *         false otherwise.
-         */
-        bool isCharacter() const A_WARN_UNUSED;
-
-        /**
-         * Checks if a key is a number.
-         *
-         * @return True if the key is a number (0-9),
-         *         false otherwise.
-         */
-        bool isNumber() const A_WARN_UNUSED;
-
-        /**
-         * Checks if a key is a letter.
-         *
-         * @return True if the key is a letter (a-z,A-Z),
-         *         false otherwise.
-         */
-        bool isLetter() const A_WARN_UNUSED;
-
-        /**
-         * Gets the value of the key. If an ascii value exists it 
-         * will be returned. Otherwise an enum value will be returned.
-         *
-         * @return the value of the key.
-         */
-        int getValue() const A_WARN_UNUSED;
-
-        /**
-         * Compares two keys.
-         *
-         * @param key The key to compare this key with.
-         * @return True if the keys are equal, false otherwise.
-         */
-        bool operator==(const Key& key) const;
-
-        /**
-         * Compares two keys.
-         *
-         * @param key The key to compare this key with.
-         * @return True if the keys are not equal, false otherwise.
-         */
-        bool operator!=(const Key& key) const;
-
-        /**
-         * An enum with key values.
-         */
         enum
         {
             SPACE              = ' ',
             TAB                = '\t',
             ENTER              = '\n',
-            LEFT_ALT           = 1000,
+            // Negative values, to avoid conflicts with higher character codes.
+            LEFT_ALT           = -1000,
             RIGHT_ALT,
             LEFT_SHIFT,
             RIGHT_SHIFT,
@@ -157,7 +105,7 @@ namespace gcn
             INSERT,
             HOME,
             PAGE_UP,
-            DELETE,
+            DELETE_,
             END,
             PAGE_DOWN,
             ESCAPE,
@@ -186,16 +134,64 @@ namespace gcn
             LEFT,
             RIGHT,
             UP,
-            DOWN
+            DOWN,
+            TEXTINPUT
         };
 
+        /**
+          * Checks if a key is a character.
+          *
+          * @return True if the key is a letter, number or whitespace,
+          *         false otherwise.
+          */
+        bool isCharacter() const A_WARN_UNUSED;
+
+        /**
+          * Checks if a key is a number.
+          *
+          * @return True if the key is a number (0-9),
+          *         false otherwise.
+          */
+        bool isNumber() const A_WARN_UNUSED;
+
+        /**
+          * Checks if a key is a letter.
+          *
+          * @return True if the key is a letter (a-z,A-Z),
+          *         false otherwise.
+          */
+        bool isLetter() const A_WARN_UNUSED;
+
+        /**
+          * Gets the value of the key. If an ascii value exists it 
+          * will be returned. Otherwise an enum value will be returned.
+          *
+          * @return the value of the key.
+          */
+        int getValue() const A_WARN_UNUSED;
+
+        /**
+          * Compares two keys.
+          *
+          * @param key The key to compare this key with.
+          * @return True if the keys are equal, false otherwise.
+          */
+        bool operator==(const Key& key) const;
+
+        /**
+          * Compares two keys.
+          *
+          * @param key The key to compare this key with.
+          * @return True if the keys are not equal, false otherwise.
+          */
+        bool operator!=(const Key& key) const;
+
     protected:
         /**
-         * Holds the value of the key. It may be an ascii value
-         * or an enum value.
-         */
+          * Holds the value of the key. It may be an ascii value
+          * or an enum value.
+          */
         int mValue;
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_KEY_HPP
+#endif  // INPUT_KEY_H
diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h
index 7f7102964..425a0c70c 100644
--- a/src/input/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -27,7 +27,7 @@
 
 #include "sdlshared.h"
 
-#include "input/inputevent.h"
+#include "events/inputevent.h"
 
 #include <string>
 
diff --git a/src/input/keydata.h b/src/input/keydata.h
index 2ceb957c5..62517b64b 100644
--- a/src/input/keydata.h
+++ b/src/input/keydata.h
@@ -23,7 +23,7 @@
 #ifndef INPUT_KEYDATA_H
 #define INPUT_KEYDATA_H
 
-#include "input/inputevent.h"
+#include "events/inputevent.h"
 
 #include <string>
 
diff --git a/src/input/keyevent.h b/src/input/keyevent.h
deleted file mode 100644
index e0b2e8e17..000000000
--- a/src/input/keyevent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2014  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 INPUT_KEYEVENT_H
-#define INPUT_KEYEVENT_H
-
-#include <guichan/key.hpp>
-#include <guichan/keyevent.hpp>
-
-#include <string>
-
-#include "localconsts.h"
-
-class KeyEvent final : public gcn::KeyEvent
-{
-    public:
-        KeyEvent(gcn::Widget *const source,
-                 const bool shiftPressed,
-                 const bool controlPressed,
-                 const bool altPressed,
-                 const bool metaPressed,
-                 const unsigned int type,
-                 const bool numericPad,
-                 const int actionId,
-                 const gcn::Key& key);
-
-        A_DELETE_COPY(KeyEvent)
-
-        ~KeyEvent();
-
-        int getActionId() const A_WARN_UNUSED
-        { return mActionId; }
-
-#ifdef USE_SDL2
-        void setText(const std::string &text)
-        { mText = text; }
-
-        std::string getText() const
-        { return mText; }
-#endif
-
-    protected:
-        int mActionId;
-#ifdef USE_SDL2
-        std::string mText;
-#endif
-};
-
-#endif  // INPUT_KEYEVENT_H
diff --git a/src/input/keyinput.h b/src/input/keyinput.h
index 25deeae19..9920cfa17 100644
--- a/src/input/keyinput.h
+++ b/src/input/keyinput.h
@@ -18,41 +18,226 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef INPUT_KEYINPUT_H
 #define INPUT_KEYINPUT_H
 
-#include <guichan/keyinput.hpp>
+#include "input/key.h"
 
 #include <string>
 
 #include "localconsts.h"
 
-class KeyInput final : public gcn::KeyInput
+class KeyInput final
 {
     public:
-        KeyInput();
+        KeyInput() :
+            mKey(0),
+            mType(0),
+#ifdef USE_SDL2
+            mText(),
+#endif
+            mActionId(-2),
+            mShiftPressed(false),
+            mControlPressed(false),
+            mAltPressed(false),
+            mMetaPressed(false),
+            mNumericPad(false)
+        { }
+
+        ~KeyInput()
+        { }
+
+        /**
+         * Key input types. This enum corresponds to the enum with event
+         * types on KeyEvent for easy mapping.
+         */
+        enum
+        {
+            PRESSED = 0,
+            RELEASED
+        };
+
+        void setType(unsigned int type)
+        {
+            mType = type;
+        }
+
+        int getType() const
+        {
+            return mType;
+        }
+
+        void setKey(const Key& key)
+        {
+            mKey = key;
+        }
+
+        const Key& getKey() const
+        {
+            return mKey;
+        }
+
+        bool isShiftPressed() const
+        {
+            return mShiftPressed;
+        }
+
+        void setShiftPressed(bool pressed)
+        {
+            mShiftPressed = pressed;
+        }
 
-        ~KeyInput();
+        bool isControlPressed() const
+        {
+            return mControlPressed;
+        }
+
+        void setControlPressed(bool pressed)
+        {
+            mControlPressed = pressed;
+        }
+
+        bool isAltPressed() const
+        {
+            return mAltPressed;
+        }
+
+        void setAltPressed(bool pressed)
+        {
+            mAltPressed = pressed;
+        }
+
+        bool isMetaPressed() const
+        {
+            return mMetaPressed;
+        }
+
+        void setMetaPressed(bool pressed)
+        {
+            mMetaPressed = pressed;
+        }
+
+        bool isNumericPad() const
+        {
+            return mNumericPad;
+        }
+
+        void setNumericPad(bool numpad)
+        {
+            mNumericPad = numpad;
+        }
 
         void setActionId(const int n)
-        { mActionId = n; }
+        {
+            mActionId = n;
+        }
 
         int getActionId() const A_WARN_UNUSED
-        { return mActionId; }
+        {
+            return mActionId;
+        }
 
 #ifdef USE_SDL2
         void setText(const std::string &text)
-        { mText = text; }
+        {
+            mText = text;
+        }
 
         std::string getText() const
-        { return mText; }
+        {
+            return mText;
+        }
 #endif
 
     protected:
-        int mActionId;
+        /**
+         * Holds the key of the key input.
+         */
+        Key mKey;
+
+        /**
+         * Holds the type of the key input.
+         */
+        unsigned int mType;
+
 #ifdef USE_SDL2
         std::string mText;
 #endif
+
+        int mActionId;
+
+        /**
+         * True if shift was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mShiftPressed;
+
+        /**
+         * True if control was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mControlPressed;
+
+        /**
+         * True if alt was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mAltPressed;
+
+        /**
+         * True if meta was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mMetaPressed;
+
+        /**
+         * True if the numeric pad was used when the key was pressed,
+         * false otherwise.
+         */
+        bool mNumericPad;
 };
 
 #endif  // INPUT_KEYINPUT_H
diff --git a/src/guichan/include/guichan/image.hpp b/src/input/mouseinput.h
index c39fe21ab..a90a1366d 100644
--- a/src/guichan/include/guichan/image.hpp
+++ b/src/input/mouseinput.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *  Copyright (C) 2012-2014  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -61,102 +61,156 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_IMAGE_HPP
-#define GCN_IMAGE_HPP
+#ifndef INPUT_MOUSEINPUT_H
+#define INPUT_MOUSEINPUT_H
 
-#include <string>
+#include "input/mouseinput.h"
 
 #include "localconsts.h"
 
-namespace gcn
+class MouseInput final
 {
-    class Color;
-
-    /**
-     * Holds an image. To be able to use this class you must first set an
-     * ImageLoader in Image by calling
-     * @code Image::setImageLoader(myImageLoader) @endcode
-     * The function is static. If this is not done, the constructor taking a
-     * filename will throw an exception. The ImageLoader you use must be
-     * compatible with the Graphics object you use.
-     *
-     * EXAMPLE: If you use SDLGraphics you should use SDLImageLoader.
-     *          Otherwise your program might crash in a most bizarre way.
-     * @see AllegroImageLoader, HGEImageLoader, OpenLayerImageLoader,
-     *      OpenGLAllegroImageLoader, OpenGLSDLImageLoader, SDLImageLoader
-     * @since 0.1.0
-     */
-    class Image
-    {
     public:
-        /**
-         * Constructor.
-         */
-        Image();
+        MouseInput() :
+            mType(0),
+            mButton(0),
+            mTimeStamp(0),
+            mX(0),
+            mY(0),
+            mRealX(0),
+            mRealY(0)
+        { }
+
+        ~MouseInput()
+        { }
 
         /**
-         * Destructor.
+         * Mouse input event types. This enum partially corresponds
+         * to the enum with event types in MouseEvent for easy mapping.
          */
-        virtual ~Image();
+        enum
+        {
+            MOVED = 0,
+            PRESSED,
+            RELEASED,
+            WHEEL_MOVED_DOWN,
+            WHEEL_MOVED_UP
+        };
 
         /**
-         * Frees an image.
-         *
-         * @since 0.5.0
+         * Mouse button types.
          */
-        virtual void free() = 0;
+        enum
+        {
+            EMPTY = 0,
+            LEFT,
+            RIGHT,
+            MIDDLE
+        };
+
+        void setType(unsigned int type)
+        {
+            mType = type;
+        }
+
+        unsigned int getType() const
+        {
+            return mType;
+        }
+
+        void setButton(unsigned int button)
+        {
+            mButton = button;
+        }
+
+        unsigned int getButton() const
+        {
+            return mButton;
+        }
+
+        int getTimeStamp() const
+        {
+            return mTimeStamp;
+        }
+
+        void setTimeStamp(int timeStamp)
+        {
+            mTimeStamp = timeStamp;
+        }
+
+        void setX(int x)
+        {
+            mX = x;
+        }
+
+        int getX() const
+        {
+            return mX;
+        }
+
+        void setY(int y)
+        {
+            mY = y;
+        }
 
+        int getY() const
+        {
+            return mY;
+        }
+
+        void setReal(const int x, const int y)
+        { mRealX = x; mRealY = y; }
+
+        int getRealX() const A_WARN_UNUSED
+        { return mRealX; }
+
+        int getRealY() const A_WARN_UNUSED
+        { return mRealY; }
+
+#ifdef ANDROID
+        int getTouchX() const A_WARN_UNUSED
+        { return mRealX; }
+
+        int getTouchY() const A_WARN_UNUSED
+        { return mRealY; }
+#else
+        int getTouchX() const A_WARN_UNUSED
+        { return mX; }
+
+        int getTouchY() const A_WARN_UNUSED
+        { return mY; }
+#endif
+
+    protected:
         /**
-         * Gets the width of the image.
-         *
-         * @return The width of the image.
-         *
-         * @since 0.1.0
+         * Holds the type of the mouse input.
          */
-        virtual int getWidth() const A_WARN_UNUSED = 0;
+        unsigned int mType;
 
         /**
-         * Gets the height of the image.
-         *
-         * @return The height of the image.
-         *
-         * @since 0.1.0
+         * Holds the button of the mouse input.
          */
-        virtual int getHeight() const A_WARN_UNUSED = 0;
+        unsigned int mButton;
 
-        /**
-         * Gets the color of a pixel at coordinate (x, y) in the image.
-         *
-         * IMPORTANT: Only guaranteed to work before the image has been
-         *            converted to display format.
-         *
-         * @param x The x coordinate.
-         * @param y The y coordinate.
-         * @return The color of the pixel.
-         *
-         * @since 0.5.0
+        /** 
+         * Holds the timestamp of the mouse input. Used to 
+         * check for double clicks.
          */
-        virtual Color getPixel(int x, int y) A_WARN_UNUSED = 0;
+        int mTimeStamp;
 
-        /**
-         * Puts a pixel with a certain color at coordinate (x, y).
-         *
-         * @param x The x coordinate.
-         * @param y The y coordinate.
-         * @param color The color of the pixel to put.
-         * @since 0.5.0
+        /** 
+         * Holds the x coordinate of the mouse input.
          */
-        virtual void putPixel(int x, int y, const Color& color) = 0;
+        int mX;
 
-        /**
-         * Converts the image, if possible, to display format.
-         *
-         * IMPORTANT: Only guaranteed to work before the image has been
-         *            converted to display format.
-         * @since 0.5.0
+        /** 
+         * Holds the y coordinate of the mouse input.
          */
-        virtual void convertToDisplayFormat() = 0;
-    };
-}  // namespace gcn
+        int mY;
+
+        int mRealX;
+
+        int mRealY;
+};
 
-#endif  // end GCN_IMAGE_HPP
+#endif  // INPUT_MOUSEINPUT_H
diff --git a/src/input/multitouchmanager.cpp b/src/input/multitouchmanager.cpp
index 7e6798807..446e40aa1 100644
--- a/src/input/multitouchmanager.cpp
+++ b/src/input/multitouchmanager.cpp
@@ -82,7 +82,7 @@ void MultiTouchManager::checkDevice(const int touchId,
             const int w = mainGraphics->mWidth;
             const int h = mainGraphics->mHeight;
             guiInput->simulateMouseClick(finger0.x * w, finger0.y * h,
-                gcn::MouseInput::RIGHT);
+                MouseInput::RIGHT);
         }
     }
 }
diff --git a/src/input/multitouchmanager.h b/src/input/multitouchmanager.h
index 076ccb3a8..82bfd0881 100644
--- a/src/input/multitouchmanager.h
+++ b/src/input/multitouchmanager.h
@@ -25,7 +25,9 @@
 
 #include "localconsts.h"
 
+#ifdef USE_SDL2
 union SDL_Event;
+#endif
 
 struct MultiTouchEvent
 {
diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/listeners/actionlistener.h
index 0f017873b..895cc985d 100644
--- a/src/guichan/include/guichan/actionlistener.hpp
+++ b/src/listeners/actionlistener.h
@@ -61,52 +61,49 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_ACTIONLISTENER_HPP
-#define GCN_ACTIONLISTENER_HPP
+#ifndef LISTENERS_ACTIONLISTENER_H
+#define LISTENERS_ACTIONLISTENER_H
 
 #include <string>
 
-#include "guichan/actionevent.hpp"
+#include "events/actionevent.h"
 
-namespace gcn
+/**
+  * Interface for listening for action events from widgets.
+  *
+  * @see Widget::addActionListener, Widget::removeActionListener,
+  *      ActionEvent
+  * @author Olof Naessén
+  * @author Per Larsson
+  */
+class ActionListener
 {
-    /**
-     * Interface for listening for action events from widgets.
-     *
-     * @see Widget::addActionListener, Widget::removeActionListener,
-     *      ActionEvent
-     * @author Olof Naessén
-     * @author Per Larsson
-     */
-    class ActionListener
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~ActionListener()
         { }
 
         /**
-         * Called when an action is recieved from a widget. It is used
-         * to be able to recieve a notification that an action has
-         * occured.
-         *
-         * @param actionEvent The event of the action.
-         * @since 0.6.0
-         */
-        virtual void action(const ActionEvent& actionEvent) = 0;
+          * Called when an action is recieved from a widget. It is used
+          * to be able to recieve a notification that an action has
+          * occured.
+          *
+          * @param actionEvent The event of the action.
+          * @since 0.6.0
+          */
+        virtual void action(const ActionEvent &actionEvent) = 0;
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of ActionListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of ActionListener,
+          * therefore its constructor is protected.
+          */
         ActionListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_ACTIONLISTENER_HPP
+#endif  // LISTENERS_ACTIONLISTENER_H
diff --git a/src/being/actorspritelistener.h b/src/listeners/actorspritelistener.h
index c89495c85..7b4d89b44 100644
--- a/src/being/actorspritelistener.h
+++ b/src/listeners/actorspritelistener.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEING_ACTORSPRITELISTENER_H
-#define BEING_ACTORSPRITELISTENER_H
+#ifndef LISTENERS_ACTORSPRITELISTENER_H
+#define LISTENERS_ACTORSPRITELISTENER_H
 
 class ActorSprite;
 
@@ -41,4 +41,4 @@ class ActorSpriteListener
         virtual void actorSpriteDestroyed(const ActorSprite &actorSprite) = 0;
 };
 
-#endif  // BEING_ACTORSPRITELISTENER_H
+#endif  // LISTENERS_ACTORSPRITELISTENER_H
diff --git a/src/configlistener.h b/src/listeners/configlistener.h
index 3de898692..757d24bfc 100644
--- a/src/configlistener.h
+++ b/src/listeners/configlistener.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIGLISTENER_H
-#define CONFIGLISTENER_H
+#ifndef LISTENERS_CONFIGLISTENER_H
+#define LISTENERS_CONFIGLISTENER_H
 
 #include <string>
 
@@ -47,4 +47,4 @@ class ConfigListener
         virtual void optionChanged(const std::string &name) = 0;
 };
 
-#endif  // CONFIGLISTENER_H
+#endif  // LISTENERS_CONFIGLISTENER_H
diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/listeners/deathlistener.h
index cc8d11990..ddd7db910 100644
--- a/src/guichan/include/guichan/deathlistener.hpp
+++ b/src/listeners/deathlistener.h
@@ -61,49 +61,46 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_DEATHLISTENER_HPP
-#define GCN_DEATHLISTENER_HPP
+#ifndef LISTENERS_DEATHLISTENER_H
+#define LISTENERS_DEATHLISTENER_H
 
 #include <string>
 
-#include "guichan/event.hpp"
+#include "events/event.h"
 
-namespace gcn
+/**
+  * Interface for listening for death events from widgets.
+  *
+  * @see Widget::addDeathListener, Widget::removeDeathListener
+  * @author Olof Naessén
+  * @since 0.6.0
+  */
+class DeathListener
 {
-    /**
-     * Interface for listening for death events from widgets.
-     *
-     * @see Widget::addDeathListener, Widget::removeDeathListener
-     * @author Olof Naessén
-     * @since 0.6.0
-     */
-    class DeathListener
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~DeathListener()
         { }
 
         /**
-         * Called when a widget dies. It is used to be able to recieve
-         * a notification when a death of a widget occurs.
-         *
-         * @param event The event of the death.
-         */
-        virtual void death(const Event& event) = 0;
+          * Called when a widget dies. It is used to be able to recieve
+          * a notification when a death of a widget occurs.
+          *
+          * @param event The event of the death.
+          */
+        virtual void death(const Event &event) = 0;
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of DeathListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of DeathListener,
+          * therefore its constructor is protected.
+          */
         DeathListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_DEATHLISTENER_HPP
+#endif  // LISTENERS_DEATHLISTENER_H
diff --git a/src/depricatedlistener.cpp b/src/listeners/depricatedlistener.cpp
index 0cd473852..c853c028d 100644
--- a/src/depricatedlistener.cpp
+++ b/src/listeners/depricatedlistener.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "depricatedlistener.h"
+#include "listeners/depricatedlistener.h"
 
 #include "debug.h"
 
diff --git a/src/depricatedlistener.h b/src/listeners/depricatedlistener.h
index 52596b70f..175eec74a 100644
--- a/src/depricatedlistener.h
+++ b/src/listeners/depricatedlistener.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DEPRICATEDLISTENER_H
-#define DEPRICATEDLISTENER_H
+#ifndef LISTENERS_DEPRICATEDLISTENER_H
+#define LISTENERS_DEPRICATEDLISTENER_H
 
 #include "depricatedevent.h"
 
@@ -37,4 +37,4 @@ class DepricatedListener
                                   const DepricatedEvent &event) = 0;
 };
 
-#endif  // DEPRICATEDLISTENER_H
+#endif  // LISTENERS_DEPRICATEDLISTENER_H
diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/listeners/focuslistener.h
index 6b3de5c83..10e4a2af0 100644
--- a/src/guichan/include/guichan/focuslistener.hpp
+++ b/src/listeners/focuslistener.h
@@ -61,59 +61,56 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_FOCUSLISTENER_HPP
-#define GCN_FOCUSLISTENER_HPP
+#ifndef LISTENERS_FOCUSLISTENER_H
+#define LISTENERS_FOCUSLISTENER_H
 
 #include <string>
 
-#include "guichan/event.hpp"
+#include "events/event.h"
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * Interface for listening for focus events from widgets.
+  *
+  * @see Widget::addFocusListener, Widget::removeFocusListener
+  * @author Olof Naessén
+  * @since 0.7.0
+  */
+class FocusListener
 {
-    /**
-     * Interface for listening for focus events from widgets.
-     *
-     * @see Widget::addFocusListener, Widget::removeFocusListener
-     * @author Olof Naessén
-     * @since 0.7.0
-     */
-    class FocusListener
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~FocusListener()
         { }
 
         /**
-         * Called when a widget gains focus. 
-         *
-         * @param event Discribes the event.
-         */
-        virtual void focusGained(const Event& event A_UNUSED)
+          * Called when a widget gains focus. 
+          *
+          * @param event Discribes the event.
+          */
+        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)
+          * Called when a widget loses focus. 
+          *
+          * @param event Discribes the event.
+          */
+        virtual void focusLost(const Event &event A_UNUSED)
         { }
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of FocusListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of FocusListener,
+          * therefore its constructor is protected.
+          */
         FocusListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_FOCUSLISTENER_HPP
+#endif  // LISTENERS_FOCUSLISTENER_H
diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/listeners/keylistener.h
index bb676052d..efc387300 100644
--- a/src/guichan/include/guichan/keylistener.hpp
+++ b/src/listeners/keylistener.h
@@ -61,59 +61,56 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_KEYLISTENER_HPP
-#define GCN_KEYLISTENER_HPP
+#ifndef LISTENERS_KEYLISTENER_H
+#define LISTENERS_KEYLISTENER_H
 
-#include "guichan/keyevent.hpp"
+#include "events/keyevent.h"
 
 #include "localconsts.h"
 
-namespace gcn
-{
-    class Key;
+class Key;
 
-    /**
-     * Interface for listening for key events from widgets.
-     *
-     * @see Widget::addKeyListener, Widget::removeKeyListener
-     */
-    class KeyListener
-    {
+/**
+  * Interface for listening for key events from widgets.
+  *
+  * @see Widget::addKeyListener, Widget::removeKeyListener
+  */
+class KeyListener
+{
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~KeyListener()
         { }
 
         /**
-         * Called if a key is pressed when the widget has keyboard focus.
-         * If a key is held down the widget will generate multiple key
-         * presses.
-         *
-         * @param keyEvent Discribes the event.
-         */
-        virtual void keyPressed(KeyEvent& keyEvent A_UNUSED)
+          * Called if a key is pressed when the widget has keyboard focus.
+          * If a key is held down the widget will generate multiple key
+          * presses.
+          *
+          * @param keyEvent Discribes the event.
+          */
+        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)
+          * Called if a key is released when the widget has keyboard focus.
+          *
+          * @param keyEvent Discribes the event.
+          */
+        virtual void keyReleased(KeyEvent &keyEvent A_UNUSED)
         { }
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of KeyListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of KeyListener,
+          * therefore its constructor is protected.
+          */
         KeyListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_KEYLISTENER_HPP
+#endif  // LISTENERS_KEYLISTENER_H
diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/listeners/mouselistener.h
index a024d202f..9a2a4ef04 100644
--- a/src/guichan/include/guichan/mouselistener.hpp
+++ b/src/listeners/mouselistener.h
@@ -61,136 +61,133 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_MOUSELISTENER_HPP
-#define GCN_MOUSELISTENER_HPP
+#ifndef LISTENERS_MOUSELISTENER_H
+#define LISTENERS_MOUSELISTENER_H
 
-#include "guichan/mouseevent.hpp"
+#include "events/mouseevent.h"
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * Interface for listening for mouse events from widgets.
+  *
+  * @see Widget::addMouseListener, Widget::removeMouseListener
+  * @since 0.1.0
+  */
+class MouseListener
 {
-    /**
-     * Interface for listening for mouse events from widgets.
-     *
-     * @see Widget::addMouseListener, Widget::removeMouseListener
-     * @since 0.1.0
-     */
-    class MouseListener
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~MouseListener()
         { }
 
         /**
-         * Called when the mouse has entered into the widget area.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseEntered(MouseEvent& mouseEvent A_UNUSED)
+          * Called when the mouse has entered into the widget area.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseEntered(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when the mouse has exited the widget area.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseExited(MouseEvent& mouseEvent A_UNUSED)
+          * Called when the mouse has exited the widget area.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseExited(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when a mouse button has been pressed on the widget area.
-         *
-         * NOTE: A mouse press is NOT equal to a mouse click.
-         *       Use mouseClickMessage to check for mouse clicks.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mousePressed(MouseEvent& mouseEvent A_UNUSED)
+          * Called when a mouse button has been pressed on the widget area.
+          *
+          * NOTE: A mouse press is NOT equal to a mouse click.
+          *       Use mouseClickMessage to check for mouse clicks.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mousePressed(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when a mouse button has been released on the widget area.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseReleased(MouseEvent& mouseEvent A_UNUSED)
+          * Called when a mouse button has been released on the widget area.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseReleased(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when a mouse button is pressed and released (clicked) on
-         * the widget area.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseClicked(MouseEvent& mouseEvent A_UNUSED)
+          * Called when a mouse button is pressed and released (clicked) on
+          * the widget area.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseClicked(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when the mouse wheel has moved up on the widget area.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseWheelMovedUp(MouseEvent& mouseEvent A_UNUSED)
+          * Called when the mouse wheel has moved up on the widget area.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseWheelMovedUp(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when the mouse wheel has moved down on the widget area.
-         *
-         * @param mousEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseWheelMovedDown(MouseEvent& mouseEvent A_UNUSED)
+          * Called when the mouse wheel has moved down on the widget area.
+          *
+          * @param mousEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseWheelMovedDown(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when the mouse has moved in the widget area and no mouse button
-         * has been pressed (i.e no widget is being dragged).
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseMoved(MouseEvent& mouseEvent A_UNUSED)
+          * Called when the mouse has moved in the widget area and no mouse button
+          * has been pressed (i.e no widget is being dragged).
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseMoved(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
         /**
-         * Called when the mouse has moved and the mouse has previously been
-         * pressed on the widget.
-         *
-         * @param mouseEvent Describes the event.
-         * @since 0.6.0
-         */
-        virtual void mouseDragged(MouseEvent& mouseEvent A_UNUSED)
+          * Called when the mouse has moved and the mouse has previously been
+          * pressed on the widget.
+          *
+          * @param mouseEvent Describes the event.
+          * @since 0.6.0
+          */
+        virtual void mouseDragged(MouseEvent &mouseEvent A_UNUSED)
         {
         }
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of MouseListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of MouseListener,
+          * therefore its constructor is protected.
+          */
         MouseListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_MOUSELISTENER_HPP
+#endif  // LISTENERS_MOUSELISTENER_H
diff --git a/src/being/playerrelationslistener.h b/src/listeners/playerrelationslistener.h
index 983f731e4..6a8bf3b20 100644
--- a/src/being/playerrelationslistener.h
+++ b/src/listeners/playerrelationslistener.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEING_PLAYERRELATIONSLISTENER_H
-#define BEING_PLAYERRELATIONSLISTENER_H
+#ifndef LISTENERS_PLAYERRELATIONSLISTENER_H
+#define LISTENERS_PLAYERRELATIONSLISTENER_H
 
 #include <string>
 
@@ -40,4 +40,4 @@ class PlayerRelationsListener
         { }
 };
 
-#endif  // BEING_PLAYERRELATIONSLISTENER_H
+#endif  // LISTENERS_PLAYERRELATIONSLISTENER_H
diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/listeners/selectionlistener.h
index 0d7f63bd8..2efe0a67e 100644
--- a/src/guichan/include/guichan/selectionlistener.hpp
+++ b/src/listeners/selectionlistener.h
@@ -61,57 +61,54 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_SELECTIONLISTENER_HPP
-#define GCN_SELECTIONLISTENER_HPP
+#ifndef LISTENERS_SELECTIONLISTENER_H
+#define LISTENERS_SELECTIONLISTENER_H
 
 #include <string>
 
-#include "guichan/selectionevent.hpp"
+#include "events/selectionevent.h"
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * Interface for listening for selection events from widgets.
+  *
+  * @see ListBox::addSelectionListener,
+  *      ListBox::removeSelectionListener,
+  *      DropDown::addSelectionListener,
+  *      DropDown::removeSelectionListener
+  * @author Olof Naessén
+  * @since 0.8.0
+  */
+class SelectionListener
 {
-    /**
-     * Interface for listening for selection events from widgets.
-     *
-     * @see ListBox::addSelectionListener,
-     *      ListBox::removeSelectionListener,
-     *      DropDown::addSelectionListener,
-     *      DropDown::removeSelectionListener
-     * @author Olof Naessén
-     * @since 0.8.0
-     */
-    class SelectionListener
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~SelectionListener()
         { }
 
         /**
-         * Called when the value of a selection has been changed in a Widget.
-         * It is used to be able to recieve a notification that a value has
-         * been changed.
-         *
-         * @param event The event of the value change.
-         * @since 0.8.0
-         */
-        virtual void valueChanged(const SelectionEvent& event A_UNUSED)
+          * Called when the value of a selection has been changed in a Widget.
+          * It is used to be able to recieve a notification that a value has
+          * been changed.
+          *
+          * @param event The event of the value change.
+          * @since 0.8.0
+          */
+        virtual void valueChanged(const SelectionEvent &event A_UNUSED)
         { }
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of SelectionListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of SelectionListener,
+          * therefore its constructor is protected.
+          */
         SelectionListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_SELECTIONLISTENER_HPP
+#endif  // LISTENERS_SELECTIONLISTENER_H
diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/listeners/widgetlistener.h
index eb584b0ed..48641cbaa 100644
--- a/src/guichan/include/guichan/widgetlistener.hpp
+++ b/src/listeners/widgetlistener.h
@@ -61,83 +61,80 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_WIDGETLISTENER_HPP
-#define GCN_WIDGETLISTENER_HPP
+#ifndef LISTENERS_WIDGETLISTENER_H
+#define LISTENERS_WIDGETLISTENER_H
 
 #include <string>
 
-#include "guichan/event.hpp"
+#include "events/event.h"
 
 #include "localconsts.h"
 
-namespace gcn
+/**
+  * Interface for listening for events from widgets. When a widget's size,
+  * location or visibility changes, the relevant method of the listener is
+  * invoked.
+  *
+  * @see Widget::addWidgetListener, Widget::removeWidgetListener
+  * @author Olof Naessén
+  * @since 0.8.0
+  */
+class WidgetListener
 {
-    /**
-     * Interface for listening for events from widgets. When a widget's size,
-     * location or visibility changes, the relevant method of the listener is
-     * invoked.
-     *
-     * @see Widget::addWidgetListener, Widget::removeWidgetListener
-     * @author Olof Naessén
-     * @since 0.8.0
-     */
-    class WidgetListener
-    {
     public:
         /**
-         * Destructor.
-         */
+          * Destructor.
+          */
         virtual ~WidgetListener()
         { }
 
         /**
-         * Invoked when a widget changes its size.
-         *
-         * @param event Describes the event.
-         * @since 0.8.0
-         */
-        virtual void widgetResized(const Event& event A_UNUSED)
+          * Invoked when a widget changes its size.
+          *
+          * @param event Describes the event.
+          * @since 0.8.0
+          */
+        virtual void widgetResized(const Event &event A_UNUSED)
         { }
 
         /**
-         * Invoked when a widget is moved.
-         *
-         * @param event Describes the event.
-         * @since 0.8.0
-         */
-        virtual void widgetMoved(const Event& event A_UNUSED)
+          * Invoked when a widget is moved.
+          *
+          * @param event Describes the event.
+          * @since 0.8.0
+          */
+        virtual void widgetMoved(const Event &event A_UNUSED)
         { }
 
         /**
-         * Invoked when a widget is hidden, i.e it's set to be
-         * not visible.
-         *
-         * @param event Describes the event.
-         * @since 0.8.0
-         */
-        virtual void widgetHidden(const Event& event A_UNUSED)
+          * Invoked when a widget is hidden, i.e it's set to be
+          * not visible.
+          *
+          * @param event Describes the event.
+          * @since 0.8.0
+          */
+        virtual void widgetHidden(const Event &event A_UNUSED)
         { }
 
         /**
-         * Invoked when a widget is shown, i.e it's set to be
-         * visible.
-         *
-         * @param event Describes the event.
-         * @since 0.8.0
-         */
-        virtual void widgetShown(const Event& event A_UNUSED)
+          * Invoked when a widget is shown, i.e it's set to be
+          * visible.
+          *
+          * @param event Describes the event.
+          * @since 0.8.0
+          */
+        virtual void widgetShown(const Event &event A_UNUSED)
         { }
 
     protected:
         /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of WidgetListener,
-         * therefore its constructor is protected.
-         */
+          * Constructor.
+          *
+          * You should not be able to make an instance of WidgetListener,
+          * therefore its constructor is protected.
+          */
         WidgetListener()
         { }
-    };
-}  // namespace gcn
+};
 
-#endif  // end GCN_WIDGETLISTENER_HPP
+#endif  // LISTENERS_WIDGETLISTENER_H
diff --git a/src/localconsts.h b/src/localconsts.h
index 58b469f01..92c36d92a 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -33,13 +33,6 @@
 #endif
 #endif
 
-#ifndef DEBUGBUILD
-#ifndef USE_INTERNALGUICHAN
-#warning using depricated way for linking with guichan. \
- Please removed configure flag --without-internalguichan
-#endif
-#endif
-
 #if !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #undef nullptr
 #define nullptr 0
diff --git a/src/logger.cpp b/src/logger.cpp
index c430aefec..21fea14d7 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -22,9 +22,10 @@
 
 #include "logger.h"
 
-#include <iostream>
 #include <sstream>
 
+#include <iostream>
+
 #ifdef WIN32
 #include <windows.h>
 #elif defined __APPLE__
diff --git a/src/main.h b/src/main.h
index 2035338a6..4d43f9447 100644
--- a/src/main.h
+++ b/src/main.h
@@ -40,13 +40,13 @@
  * by the map, interleaved with the tiles in the fringe layer.
  *
  * The client supports two servers, \link EAthena eAthena\endlink (the TMW
- * version) and the \link ManaServ Mana server\endlink. To achieve this, the
+ * version) and the \link EvolServ server\endlink. To achieve this, the
  * \link Net network communication layer\endlink is abstracted in many
  * different interfaces, which have different implementations for each server.
  */
 
-#define SMALL_VERSION "1.4.2.15"
-#define CHECK_VERSION "01.04.02.15"
+#define SMALL_VERSION "1.4.3.1"
+#define CHECK_VERSION "01.04.03.01"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/src/map.cpp b/src/map.cpp
index 5dc1bfc0f..70a48b811 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -401,7 +401,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
         graphics->setColor(userPalette->getColorWithAlpha(
             UserPalette::WALKABLE_HIGHLIGHT));
 
-        graphics->fillRectangle(gcn::Rectangle(0, 0,
+        graphics->fillRectangle(Rect(0, 0,
             graphics->mWidth, graphics->mHeight));
     }
 
@@ -549,7 +549,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
         {\
             graphics->setColor(userPalette->getColorWithAlpha(\
                 UserPalette::color));\
-            graphics->fillRectangle(gcn::Rectangle(\
+            graphics->fillRectangle(Rect(\
                 x0 * mTileWidth - scrollX, \
                 y * mTileHeight - scrollY, \
                 width, mapTileSize));\
@@ -800,131 +800,6 @@ const std::string Map::getFilename() const
     return fileName.substr(lastSlash, fileName.rfind(".") - lastSlash);
 }
 
-#ifdef MANASERV_SUPPORT
-Position Map::checkNodeOffsets(int radius, const unsigned char walkMask,
-                               const Position &position) const
-{
-    // Pre-computing character's position in tiles
-    const int tx = position.x / mapTileSize;
-    const int ty = position.y / mapTileSize;
-
-    // Pre-computing character's position offsets.
-    int fx = position.x % mapTileSize;
-    int fy = position.y % mapTileSize;
-
-    // Compute the being radius:
-    // FIXME: Hande beings with more than 1/2 tile radius by not letting them
-    // go or spawn in too narrow places. The server will have to be aware
-    // of being's radius value (in tiles) to handle this gracefully.
-    if (radius > mapTileSize / 2)
-        radius = mapTileSize / 2;
-    // set a default value if no value returned.
-    if (radius < 1)
-        radius = mapTileSize / 3;
-
-    // We check diagonal first as they are more restrictive.
-    // Top-left border check
-    if (!getWalk(tx - 1, ty - 1, walkMask)
-        && fy < radius && fx < radius)
-    {
-        fx = radius;
-        fy = radius;
-    }
-    // Top-right border check
-    if (!getWalk(tx + 1, ty - 1, walkMask)
-        && (fy < radius) && fx > (mapTileSize - radius))
-    {
-        fx = mapTileSize - radius;
-        fy = radius;
-    }
-    // Bottom-left border check
-    if (!getWalk(tx - 1, ty + 1, walkMask)
-        && fy > (mapTileSize - radius) && fx < radius)
-    {
-        fx = radius;
-        fy = mapTileSize - radius;
-    }
-    // Bottom-right border check
-    if (!getWalk(tx + 1, ty + 1, walkMask)
-        && fy > (mapTileSize - radius) && fx > (mapTileSize - radius))
-    {
-        fx = mapTileSize - radius;
-        fy = fx;
-    }
-
-    // Fix coordinates so that the player does not seem to dig into walls.
-    if (fx > (mapTileSize - radius) && !getWalk(tx + 1, ty, walkMask))
-        fx = mapTileSize - radius;
-    else if (fx < radius && !getWalk(tx - 1, ty, walkMask))
-        fx = radius;
-    else if (fy > (mapTileSize - radius) && !getWalk(tx, ty + 1, walkMask))
-        fy = mapTileSize - radius;
-    else if (fy < radius && !getWalk(tx, ty - 1, walkMask))
-        fy = radius;
-
-    return Position(tx * mapTileSize + fx, ty * mapTileSize + fy);
-}
-
-Path Map::findPixelPath(const int startPixelX, const int startPixelY,
-                        const int endPixelX, const int endPixelY,
-                        const int radius, const unsigned char walkMask,
-                        const int maxCost)
-{
-    Path myPath = findPath(startPixelX / mapTileSize,
-        startPixelY / mapTileSize,
-        endPixelX / mapTileSize,
-        endPixelY / mapTileSize,
-        walkMask, maxCost);
-
-    // Don't compute empty coordinates.
-    if (myPath.empty())
-        return myPath;
-
-    // Find the starting offset
-    const float startOffsetX = static_cast<float>(startPixelX % mapTileSize);
-    const float startOffsetY = static_cast<float>(startPixelY % mapTileSize);
-
-    // Find the ending offset
-    const float endOffsetX = static_cast<float>(endPixelX % mapTileSize);
-    const float endOffsetY = static_cast<float>(endPixelY % mapTileSize);
-
-    const int sz = static_cast<int>(myPath.size());
-    // Find the distance, and divide it by the number of steps
-    const int changeX = static_cast<int>((endOffsetX - startOffsetX)
-        / static_cast<float>(sz));
-    const int changeY = static_cast<int>((endOffsetY - startOffsetY)
-        / static_cast<float>(sz));
-
-    // Convert the map path to pixels over tiles
-    // And add interpolation between the starting and ending offsets
-    Path::iterator it = myPath.begin();
-    const Path::iterator it_end = myPath.end();
-    int i = 0;
-    while (it != it_end)
-    {
-        // A position that is valid on the start and end tile is not
-        // necessarily valid on all the tiles in between, so check the offsets.
-        *it = checkNodeOffsets(radius, walkMask,
-            it->x * mapTileSize + startOffsetX
-            + static_cast<float>(changeX * i),
-            it->y * mapTileSize + startOffsetY
-            + static_cast<float>(changeY * i));
-        i++;
-        ++it;
-    }
-
-    // Remove the last path node, as it's more clever to go to the destination.
-    // It also permit to avoid zigzag at the end of the path,
-    // especially with mouse.
-    const Position destination = checkNodeOffsets(radius, walkMask,
-                                            endPixelX, endPixelY);
-    myPath.pop_back();
-    myPath.push_back(destination);
-
-    return myPath;
-}
-#endif
-
 Path Map::findPath(const int startX, const int startY,
                    const int destX, const int destY,
                    const unsigned char walkmask, const int maxCost)
diff --git a/src/map.h b/src/map.h
index 26303da7a..0ad048e7e 100644
--- a/src/map.h
+++ b/src/map.h
@@ -23,12 +23,13 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "configlistener.h"
 #include "position.h"
 #include "properties.h"
 
 #include "being/actor.h"
 
+#include "listeners/configlistener.h"
+
 #include "render/renderers.h"
 
 #include <string>
@@ -277,29 +278,6 @@ class Map final : public Properties, public ConfigListener
          */
         const std::string getFilename() const A_WARN_UNUSED;
 
-#ifdef MANASERV_SUPPORT
-        /**
-         * Check the current position against surrounding blocking tiles, and
-         * correct the position offset within tile when needed.
-         */
-        Position checkNodeOffsets(int radius, const unsigned char walkMask,
-                                  const Position &position)
-                                  const A_WARN_UNUSED;
-
-        Position checkNodeOffsets(const int radius,
-                                  const unsigned char walkMask,
-                                  const int x, const int y) const A_WARN_UNUSED
-        { return checkNodeOffsets(radius, walkMask, Position(x, y)); }
-
-        /**
-         * Find a pixel path from one location to the next.
-         */
-        Path findPixelPath(const int startPixelX, const int startPixelY,
-                           const int destPixelX, const int destPixelY,
-                           const int radius, const unsigned char walkmask,
-                           const int maxCost = 20) A_WARN_UNUSED;
-#endif
-
         /**
          * Find a path from one location to the next.
          */
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 3da8ba7d9..701fa9958 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -33,10 +33,11 @@
 
 #include "render/graphics.h"
 
+#include "resources/image.h"
 #include "resources/resourcemanager.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 
 #include "utils/dtor.h"
 
@@ -139,7 +140,7 @@ void MapLayer::draw(Graphics *const graphics,
 
                     if (!c)
                     {
-                        graphics->drawImage2(img, px, py);
+                        graphics->drawImage(img, px, py);
                     }
                     else
                     {
@@ -455,7 +456,7 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
 
                         if (!c)
                         {
-                            graphics->drawImage2(img, px, py);
+                            graphics->drawImage(img, px, py);
                         }
                         else
                         {
@@ -537,10 +538,10 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
             {
                 graphics->setColor(userPalette->getColorWithAlpha(
                     UserPalette::ATTACK_RANGE));
-                graphics->fillRectangle(gcn::Rectangle(x, y, w, h));
+                graphics->fillRectangle(Rect(x, y, w, h));
                 graphics->setColor(userPalette->getColorWithAlpha(
                     UserPalette::ATTACK_RANGE_BORDER));
-                graphics->drawRectangle(gcn::Rectangle(x, y, w, h));
+                graphics->drawRectangle(Rect(x, y, w, h));
             }
         }
     }
@@ -797,7 +798,7 @@ void MapItem::draw(Graphics *const graphics, const int x, const int y,
 {
     BLOCK_START("MapItem::draw")
     if (mImage)
-        graphics->drawImage2(mImage, x, y);
+        graphics->drawImage(mImage, x, y);
 
     switch (mType)
     {
@@ -805,17 +806,17 @@ void MapItem::draw(Graphics *const graphics, const int x, const int y,
         case CROSS:
             graphics->setColor(userPalette->getColorWithAlpha(
                                UserPalette::ROAD_POINT));
-            graphics->fillRectangle(gcn::Rectangle(x + dx / 3, y + dy / 3,
+            graphics->fillRectangle(Rect(x + dx / 3, y + dy / 3,
                                     dx / 3, dy / 3));
             break;
         case HOME:
         {
             graphics->setColor(userPalette->getColorWithAlpha(
                                UserPalette::HOME_PLACE));
-            graphics->fillRectangle(gcn::Rectangle(x, y, dx, dy));
+            graphics->fillRectangle(Rect(x, y, dx, dy));
             graphics->setColor(userPalette->getColorWithAlpha(
                                UserPalette::HOME_PLACE_BORDER));
-            graphics->drawRectangle(gcn::Rectangle(x, y, dx, dy));
+            graphics->drawRectangle(Rect(x, y, dx, dy));
             break;
         }
         default:
@@ -823,7 +824,7 @@ void MapItem::draw(Graphics *const graphics, const int x, const int y,
     }
     if (!mName.empty() && mType != PORTAL && mType != EMPTY)
     {
-        gcn::Font *const font = gui->getFont();
+        Font *const font = gui->getFont();
         if (font)
         {
             graphics->setColor(userPalette->getColor(UserPalette::BEING));
diff --git a/src/maplayer.h b/src/maplayer.h
index dcfdb991e..88db82214 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -23,10 +23,11 @@
 #ifndef MAPLAYER_H
 #define MAPLAYER_H
 
-#include "configlistener.h"
 #include "position.h"
 #include "main.h"
 
+#include "listeners/configlistener.h"
+
 #include "being/actor.h"
 
 #include <string>
diff --git a/src/mouseinput.h b/src/mouseinput.h
deleted file mode 100644
index 1ed155aa8..000000000
--- a/src/mouseinput.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2014  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 MOUSEINPUT_H
-#define MOUSEINPUT_H
-
-#include <guichan/mouseinput.hpp>
-
-#include "localconsts.h"
-
-class MouseInput final : public gcn::MouseInput
-{
-    public:
-        MouseInput();
-
-        ~MouseInput();
-
-        void setReal(const int x, const int y)
-        { mRealX = x; mRealY = y; }
-
-        int getRealX() const A_WARN_UNUSED
-        { return mRealX; }
-
-        int getRealY() const A_WARN_UNUSED
-        { return mRealY; }
-
-#ifdef ANDROID
-        int getTouchX() const A_WARN_UNUSED
-        { return mRealX; }
-
-        int getTouchY() const A_WARN_UNUSED
-        { return mRealY; }
-#else
-        int getTouchX() const A_WARN_UNUSED
-        { return mX; }
-
-        int getTouchY() const A_WARN_UNUSED
-        { return mY; }
-#endif
-
-    protected:
-        int mRealX;
-        int mRealY;
-};
-
-#endif  // MOUSEINPUT_H
diff --git a/src/net/download.cpp b/src/net/download.cpp
index d0c6515fc..141a7772f 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -568,6 +568,7 @@ size_t Download::writeFunction(void *ptr,
     memcpy(buf, ptr, totalMem);
     buf[totalMem] = 0;
     mUploadResponse.append(buf);
+    delete [] buf;
     return totalMem;
 }
 
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 0f592b123..d55a3cea6 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -39,8 +39,6 @@
 #include "net/chathandler.h"
 #include "net/net.h"
 
-#include "net/ea/eaprotocol.h"
-
 #include "utils/timer.h"
 
 #include "debug.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index a11c157fd..d541ce09b 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,6 +33,7 @@
 #include "net/ea/gamehandler.h"
 #include "net/ea/network.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "utils/dtor.h"
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 5ffd714f2..af6aafa9b 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -24,8 +24,13 @@
 #define NET_EA_CHARSERVERHANDLER_H
 
 #include "net/charserverhandler.h"
-#include "net/messagein.h"
-#include "net/serverinfo.h"
+
+class ServerInfo;
+
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 6654950f2..997e4bfc1 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -38,6 +38,8 @@
 
 #include "gui/widgets/tabs/chattab.h"
 
+#include "net/messagein.h"
+
 #include <string>
 
 #include "debug.h"
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 1fabda09d..237abf10a 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -24,10 +24,14 @@
 #define NET_EA_CHATHANDLER_H
 
 #include "net/chathandler.h"
-#include "net/messagein.h"
 
 #include <queue>
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 6e1982b6d..de1d6f151 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -31,6 +31,8 @@
 
 #include "gui/windows/okdialog.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 8a31ee030..4a0624be0 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -24,7 +24,11 @@
 #define NET_EA_GAMEHANDLER_H
 
 #include "net/gamehandler.h"
-#include "net/messagein.h"
+
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 46b1f1649..af8c3b8df 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -28,10 +28,9 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "net/guildhandler.h"
 #include "net/net.h"
 
-#include "net/ea/guildhandler.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index 2b6a4bd1a..931b53397 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -31,7 +31,8 @@ namespace Ea
 /**
  * A tab for a guild chat channel.
  */
-class GuildTab : public ChatTab, public ConfigListener
+class GuildTab : public ChatTab,
+                 public ConfigListener
 {
     public:
         explicit GuildTab(const Widget2 *const widget);
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index d141452d0..6c61990dd 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -31,7 +31,8 @@ namespace Ea
 /**
  * A tab for a party chat channel.
  */
-class PartyTab : public ChatTab, public ConfigListener
+class PartyTab : public ChatTab,
+                 public ConfigListener
 {
     public:
         explicit PartyTab(const Widget2 *const widget);
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 536c93263..1e56ac75b 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -30,6 +30,10 @@
 
 #include "gui/windows/socialwindow.h"
 
+#include "net/messagein.h"
+
+#include "net/ea/gui/guildtab.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 191d6fd44..e8bec6a09 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -23,12 +23,15 @@
 #define NET_EA_GUILDHANDLER_H
 
 #include "net/guildhandler.h"
-#include "net/messagein.h"
 
-#include "net/ea/gui/guildtab.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
+class GuildTab;
 
 class GuildHandler : public Net::GuildHandler
 {
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 74f0a4ba7..2262a79f9 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -29,6 +29,8 @@
 
 #include "gui/windows/ministatuswindow.h"
 
+#include "net/messagein.h"
+
 #include "net/ea/eaprotocol.h"
 
 #include "debug.h"
@@ -150,7 +152,7 @@ int InventoryHandler::convertFromServerSlot(const int serverSlot) const
     return EQUIP_CONVERT[serverSlot];
 }
 
-int InventoryHandler::getSlot(const int eAthenaSlot) const
+int InventoryHandler::getSlot(const int eAthenaSlot)
 {
     if (eAthenaSlot == 0)
         return Equipment::EQUIP_VECTOREND;
@@ -158,7 +160,7 @@ int InventoryHandler::getSlot(const int eAthenaSlot) const
     if (eAthenaSlot & 0x8000)
         return Equipment::EQUIP_PROJECTILE_SLOT;
 
-    int mask = 1;
+    unsigned int mask = 1;
     int position = 0;
     while (!(eAthenaSlot & mask))
     {
@@ -564,7 +566,7 @@ void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
         miniStatusWindow->updateArrows();
 }
 
-void InventoryHandler::processPlayerAttackRange(Net::MessageIn &msg) const
+void InventoryHandler::processPlayerAttackRange(Net::MessageIn &msg)
 {
     const int range = msg.readInt16();
     if (player_node)
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 6e8ecec38..ac88c1d6c 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -33,11 +33,15 @@
 #include "gui/windows/inventorywindow.h"
 
 #include "net/inventoryhandler.h"
-#include "net/messagein.h"
 
 #include <vector>
 #include <queue>
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
@@ -171,7 +175,7 @@ class InventoryHandler : public Net::InventoryHandler
         void pushPickup(const int floorId)
         { mSentPickups.push(floorId); }
 
-        int getSlot(const int eAthenaSlot) const A_WARN_UNUSED;
+        static int getSlot(const int eAthenaSlot) A_WARN_UNUSED;
 
         void processPlayerInventory(Net::MessageIn &msg,
                                     const bool playerInvintory);
@@ -200,7 +204,7 @@ class InventoryHandler : public Net::InventoryHandler
 
         void processPlayerUnEquip(Net::MessageIn &msg);
 
-        void processPlayerAttackRange(Net::MessageIn &msg) const;
+        static void processPlayerAttackRange(Net::MessageIn &msg);
 
         void processPlayerArrowEquip(Net::MessageIn &msg);
 
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index 9ce85a59b..383ba2753 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -24,6 +24,8 @@
 
 #include "actormanager.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 6bc23fb10..80c0a4dbf 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -25,6 +25,13 @@
 
 #include "net/messagein.h"
 
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 57edcefbf..44d834b94 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -32,6 +32,8 @@
 #include "utils/gettext.h"
 #include "utils/paths.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
@@ -68,12 +70,7 @@ void LoginHandler::loginAccount(LoginData *const loginData1) const
 {
     if (loginData1)
     {
-        // Since we're attempting to use the tAthena protocol,
-        // let's reset the character slots to the good value,
-        // in case we just logged out a Manaserv server
-        // with a different config.
         loginData1->resetCharacterSlots();
-
         sendLoginRegister(loginData1->username, loginData1->password, "");
     }
 }
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 8fea9d49f..f539176f5 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -24,7 +24,6 @@
 #define NET_EA_LOGINHANDLER_H
 
 #include "net/loginhandler.h"
-#include "net/messagein.h"
 
 #include "net/ea/token.h"
 
@@ -32,6 +31,11 @@
 
 class LoginData;
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 70c4ce08a..03def7298 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -24,6 +24,8 @@
 
 #include "gui/windows/npcdialog.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index b8a10bc18..07c281587 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -23,11 +23,17 @@
 #ifndef NET_EA_NPCHANDLER_H
 #define NET_EA_NPCHANDLER_H
 
-#include "net/messagein.h"
 #include "net/npchandler.h"
 
+#include "localconsts.h"
+
 class NpcDialog;
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 98dec750a..4e4cac3df 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -25,11 +25,16 @@
 #include "configuration.h"
 #include "notifications.h"
 #include "notifymanager.h"
+#include "party.h"
 
 #include "being/localplayer.h"
 
 #include "gui/windows/socialwindow.h"
 
+#include "net/messagein.h"
+
+#include "net/ea/gui/partytab.h"
+
 #include "debug.h"
 
 namespace Ea
@@ -55,7 +60,7 @@ void PartyHandler::join(const int partyId A_UNUSED) const
 {
 }
 
-void PartyHandler::reload() const
+void PartyHandler::reload()
 {
     taParty = Party::getParty(1);
 }
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index e7ab8f8ef..24923bd4a 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -22,15 +22,18 @@
 #ifndef NET_EA_PARTYHANDLER_H
 #define NET_EA_PARTYHANDLER_H
 
-#include "net/messagein.h"
 #include "net/partyhandler.h"
 
-#include "net/ea/gui/partytab.h"
+class Party;
 
-#include "party.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
+class PartyTab;
 
 class PartyHandler : public Net::PartyHandler
 {
@@ -49,7 +52,7 @@ class PartyHandler : public Net::PartyHandler
         PartyShare getShareItems() const override final A_WARN_UNUSED
         { return mShareItems; }
 
-        void reload() const;
+        static void reload();
 
         void clear() const override final;
 
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 3e5db9169..de376cead 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -41,6 +41,7 @@
 
 #include "resources/db/deaddb.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "net/ea/eaprotocol.h"
@@ -60,9 +61,9 @@ namespace
     /**
      * Listener used for handling the overweigth message.
      */
-    struct WeightListener final : public gcn::ActionListener
+    struct WeightListener final : public ActionListener
     {
-        void action(const gcn::ActionEvent &event A_UNUSED)
+        void action(const ActionEvent &event A_UNUSED)
         {
             weightNotice = nullptr;
         }
@@ -71,9 +72,9 @@ namespace
     /**
      * Listener used for handling death message.
      */
-    struct DeathListener final : public gcn::ActionListener
+    struct DeathListener final : public ActionListener
     {
-        void action(const gcn::ActionEvent &event A_UNUSED)
+        void action(const ActionEvent &event A_UNUSED)
         {
             if (Net::getPlayerHandler())
                 Net::getPlayerHandler()->respawn();
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 589874e2e..087627f92 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -23,9 +23,13 @@
 #ifndef NET_EA_PLAYERHANDLER_H
 #define NET_EA_PLAYERHANDLER_H
 
-#include "net/messagein.h"
 #include "net/playerhandler.h"
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 3a5a1ab75..fd10a6087 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -33,6 +33,8 @@
 
 #include "utils/stringutils.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 /** job dependend identifiers (?)  */
diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h
index 8dc724e0a..484ca6878 100644
--- a/src/net/ea/skillhandler.h
+++ b/src/net/ea/skillhandler.h
@@ -23,9 +23,15 @@
 #ifndef NET_EA_SKILLHANDLER_H
 #define NET_EA_SKILLHANDLER_H
 
-#include "net/messagein.h"
 #include "net/skillhandler.h"
 
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 9457a31db..19e597967 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -34,6 +34,7 @@
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/tradewindow.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "net/ea/eaprotocol.h"
@@ -48,9 +49,9 @@ ConfirmDialog *confirmDlg = nullptr;
  */
 namespace
 {
-    struct RequestTradeListener : public gcn::ActionListener
+    struct RequestTradeListener : public ActionListener
     {
-        void action(const gcn::ActionEvent &event)
+        void action(const ActionEvent &event)
         {
             confirmDlg = nullptr;
             const std::string &eventId = event.getId();
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 22a78e9e6..d4c9510b8 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -23,9 +23,13 @@
 #ifndef NET_EA_TRADEHANDLER_H
 #define NET_EA_TRADEHANDLER_H
 
-#include "net/messagein.h"
 #include "net/tradehandler.h"
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 61e0a8404..a9d11f563 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -24,8 +24,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/widgets/tabs/chattab.h"
-
+#include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
 #include <string>
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 9c6b8ea0c..3efaf2d31 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -26,10 +26,10 @@
 #include "net/ea/chathandler.h"
 
 #include "net/eathena/messagehandler.h"
-#include "net/eathena/messageout.h"
 
 namespace EAthena
 {
+class MessageOut;
 
 class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 {
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index ebb5d46d7..3a18dede9 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -33,6 +33,7 @@
 
 #include "net/ea/guildhandler.h"
 
+#include "net/ea/gui/guildtab.h"
 #include "net/ea/gui/partytab.h"
 
 #include "net/eathena/adminhandler.h"
diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp
index 3ac6a417e..ff16f5dd0 100644
--- a/src/net/eathena/messageout.cpp
+++ b/src/net/eathena/messageout.cpp
@@ -96,7 +96,7 @@ void MessageOut::writeCoordinates(const uint16_t x,
     mNetwork->mOutSize += 3;
     mPos += 3;
 
-    int16_t temp = x;
+    uint16_t temp = x;
     temp <<= 6;
     data[0] = 0;
     data[1] = 1;
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 56d4f5aae..0162d82e8 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -24,6 +24,7 @@
 
 #include "logger.h"
 
+#include "net/eathena/messagehandler.h"
 #include "net/eathena/messagein.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index 4c9349f96..fae4f06d5 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -25,8 +25,6 @@
 
 #include "net/ea/network.h"
 
-#include "net/eathena/messagehandler.h"
-
 /**
  * Protocol version, reported to the eAthena char and mapserver who can adjust
  * the protocol accordingly.
@@ -35,6 +33,7 @@
 
 namespace EAthena
 {
+class MessageHandler;
 
 class Network final : public Ea::Network
 {
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index fcc650171..cfec2fe81 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -24,6 +24,7 @@
 #include "actormanager.h"
 #include "notifications.h"
 #include "notifymanager.h"
+#include "party.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 0c3fa27ff..91c2e4603 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -36,11 +36,6 @@ namespace Net
 class LoginHandler
 {
     public:
-        /**
-         * This enum describes options specific to either eAthena or Manaserv.
-         * By querying for these flags, the GUI can adapt to the current
-         * server type dynamically.
-         */
         enum OptionalAction
         {
             Unregister          = 0x1,
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 9d9c68b94..121e1e58f 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -59,22 +59,6 @@ unsigned char MessageIn::readInt8()
     return value;
 }
 
-void MessageIn::readCoordinates(uint16_t &restrict x, uint16_t &restrict y)
-{
-    if (mPos + 3 <= mLength)
-    {
-        const unsigned char *const p
-            = reinterpret_cast<unsigned char const *const>(mData + mPos);
-        x = static_cast<uint16_t>(p[0] | ((p[1] & 0x07) << 8));
-        y = static_cast<uint16_t>((p[1] >> 3) | ((p[2] & 0x3F) << 5));
-    }
-    mPos += 3;
-    PacketCounters::incInBytes(3);
-    DEBUGLOG(std::string("readCoordinates: ").append(toString(
-        static_cast<int>(x))).append(",").append(toString(
-        static_cast<int>(y))));
-}
-
 uint8_t MessageIn::fromServerDirection(const uint8_t serverDir)
 {
     // Translate from eAthena format
@@ -97,10 +81,7 @@ uint8_t MessageIn::fromServerDirection(const uint8_t serverDir)
         case 7:
             return 9;
         case 8:
-#ifdef MANASERV_SUPPORT
-            if (Net::getNetworkType() != ServerInfo::MANASERV)
-#endif
-                return 8;
+            return 8;
         default:
             logger->log("incorrect direction: %d",
                 static_cast<int>(serverDir));
@@ -115,7 +96,7 @@ void MessageIn::readCoordinates(uint16_t &restrict x, uint16_t &restrict y,
     if (mPos + 3 <= mLength)
     {
         const char *const data = mData + mPos;
-        int16_t temp = MAKEWORD(data[1] & 0x00c0, data[0] & 0x00ff);
+        uint16_t temp = MAKEWORD(data[1] & 0x00c0, data[0] & 0x00ff);
         x = static_cast<uint16_t>(temp >> 6);
         temp = MAKEWORD(data[2] & 0x00f0, data[1] & 0x003f);
         y = static_cast<uint16_t>(temp >> 4);
@@ -147,7 +128,7 @@ void MessageIn::readCoordinatePair(uint16_t &restrict srcX,
     if (mPos + 5 <= mLength)
     {
         const char *const data = mData + mPos;
-        int16_t temp = MAKEWORD(data[3], data[2] & 0x000f);
+        uint16_t temp = MAKEWORD(data[3], data[2] & 0x000f);
         dstX = static_cast<uint16_t>(temp >> 2);
 
         dstY = MAKEWORD(data[4], data[3] & 0x0003);
diff --git a/src/net/messagein.h b/src/net/messagein.h
index c3ed294c3..7b2b2400b 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -65,13 +65,6 @@ class MessageIn
         virtual int readInt32() = 0;        /**< Reads a long. */
 
         /**
-         * Reads a 3-byte block containing tile-based coordinates. Used by
-         * manaserv.
-         */
-        virtual void readCoordinates(uint16_t &restrict x,
-                                     uint16_t &restrict y);
-
-        /**
          * Reads a special 3 byte block used by eAthena, containing x and y
          * coordinates and direction.
          */
diff --git a/src/net/net.cpp b/src/net/net.cpp
index c7a4f33f7..90cf9e16a 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -32,10 +32,6 @@
 #include "net/eathena/generalhandler.h"
 #endif
 
-#ifdef MANASERV_SUPPORT
-#include "net/manaserv/generalhandler.h"
-#endif
-
 #include "debug.h"
 
 Net::AdminHandler *adminHandler = nullptr;
@@ -162,13 +158,6 @@ void connectToServer(const ServerInfo &server)
                 new TmwAthena::GeneralHandler;
 #endif
                 break;
-            case ServerInfo::MANASERV:
-#ifdef MANASERV_SUPPORT
-                new ManaServ::GeneralHandler;
-#else
-                new TmwAthena::GeneralHandler;
-#endif
-                break;
             case ServerInfo::TMWATHENA:
             case ServerInfo::UNKNOWN:
             default:
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 0b17184fd..48f216855 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -38,7 +38,6 @@ public:
     enum Type
     {
         UNKNOWN = 0,
-        MANASERV,
         TMWATHENA,
         EVOL,
         EATHENA
@@ -139,10 +138,6 @@ public:
         else if (compareStrI(serverType, "eathena") == 0)
             return TMWATHENA;
 #endif
-#ifdef MANASERV_SUPPORT
-        else if (compareStrI(serverType, "manaserv") == 0)
-            return MANASERV;
-#endif
         return UNKNOWN;
     }
 };
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index af236f00b..d00f12dd3 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -24,8 +24,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/widgets/tabs/chattab.h"
-
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include <string>
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index a7226c52c..c4f51fec7 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -26,10 +26,10 @@
 #include "net/ea/chathandler.h"
 
 #include "net/tmwa/messagehandler.h"
-#include "net/tmwa/messageout.h"
 
 namespace TmwAthena
 {
+class MessageOut;
 
 class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 {
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 683eb0711..46d1d490f 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -33,6 +33,7 @@
 
 #include "net/ea/guildhandler.h"
 
+#include "net/ea/gui/guildtab.h"
 #include "net/ea/gui/partytab.h"
 
 #include "net/tmwa/adminhandler.h"
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 8dfbf2bd7..8c3ecb5ec 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -98,7 +98,7 @@ void MessageOut::writeCoordinates(const uint16_t x,
     mNetwork->mOutSize += 3;
     mPos += 3;
 
-    int16_t temp = x;
+    uint16_t temp = x;
     temp <<= 6;
     data[0] = 0;
     data[1] = 1;
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index c91387898..cc94b6161 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -24,6 +24,7 @@
 
 #include "logger.h"
 
+#include "net/tmwa/messagehandler.h"
 #include "net/tmwa/messagein.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 6d05d0e48..bf9381227 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -25,8 +25,6 @@
 
 #include "net/ea/network.h"
 
-#include "net/tmwa/messagehandler.h"
-
 /**
  * Protocol version, reported to the eAthena char and mapserver who can adjust
  * the protocol accordingly.
@@ -36,6 +34,7 @@
 
 namespace TmwAthena
 {
+class MessageHandler;
 
 class Network final : public Ea::Network
 {
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 78d56f669..ba18a9efa 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -24,6 +24,7 @@
 #include "actormanager.h"
 #include "notifications.h"
 #include "notifymanager.h"
+#include "party.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 6b9e5adb7..3293b7edd 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -24,8 +24,7 @@
 
 #include "net/net.h"
 
-#include "net/tmwa/chathandler.h"
-#include "net/tmwa/protocol.h"
+#include "net/chathandler.h"
 
 #include "debug.h"
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 823352239..21ca65e97 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -29,6 +29,8 @@
 
 #include "localconsts.h"
 
+class Item;
+
 namespace Net
 {
 class TradeHandler
diff --git a/src/particle/imageparticle.cpp b/src/particle/imageparticle.cpp
index e41c072b4..92f458e41 100644
--- a/src/particle/imageparticle.cpp
+++ b/src/particle/imageparticle.cpp
@@ -103,6 +103,6 @@ void ImageParticle::draw(Graphics *const graphics,
     }
 
     mImage->setAlpha(alphafactor);
-    graphics->drawImage2(mImage, screenX, screenY);
+    graphics->drawImage(mImage, screenX, screenY);
     return;
 }
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index a9cc9993f..c446fa177 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -414,8 +414,8 @@ Particle *Particle::addEffect(const std::string &particleEffectFile,
 
 Particle *Particle::addTextSplashEffect(const std::string &text,
                                         const int x, const int y,
-                                        const gcn::Color *const color,
-                                        gcn::Font *const font,
+                                        const Color *const color,
+                                        Font *const font,
                                         const bool outline)
 {
     Particle *const newParticle = new TextParticle(text, color, font, outline);
@@ -438,8 +438,8 @@ Particle *Particle::addTextSplashEffect(const std::string &text,
 
 Particle *Particle::addTextRiseFadeOutEffect(const std::string &text,
                                              const int x, const int y,
-                                             const gcn::Color *const color,
-                                             gcn::Font *const font,
+                                             const Color *const color,
+                                             Font *const font,
                                              const bool outline)
 {
     Particle *const newParticle = new TextParticle(text, color, font, outline);
diff --git a/src/particle/particle.h b/src/particle/particle.h
index f75803772..491232b17 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -30,15 +30,11 @@
 #include <list>
 #include <string>
 
+class Color;
+class Font;
 class Particle;
 class ParticleEmitter;
 
-namespace gcn
-{
-    class Color;
-    class Font;
-}
-
 typedef std::list<Particle *> Particles;
 typedef Particles::iterator ParticleIterator;
 typedef Particles::const_iterator ParticleConstIterator;
@@ -135,8 +131,8 @@ class Particle : public Actor
          */
         Particle *addTextSplashEffect(const std::string &text,
                                       const int x, const int y,
-                                      const gcn::Color *const color,
-                                      gcn::Font *const font,
+                                      const Color *const color,
+                                      Font *const font,
                                       const bool outline = false);
 
         /**
@@ -144,8 +140,8 @@ class Particle : public Actor
          */
         Particle *addTextRiseFadeOutEffect(const std::string &text,
                                            const int x, const int y,
-                                           const gcn::Color *const color,
-                                           gcn::Font *const font,
+                                           const Color *const color,
+                                           Font *const font,
                                            const bool outline = false);
 
         /**
diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp
index 54de26887..41ea683f6 100644
--- a/src/particle/textparticle.cpp
+++ b/src/particle/textparticle.cpp
@@ -26,14 +26,14 @@
 
 #include "gui/theme.h"
 
-#include <guichan/color.hpp>
-#include <guichan/font.hpp>
+#include "gui/color.h"
+#include "gui/font.h"
 
 #include "debug.h"
 
 TextParticle::TextParticle(const std::string &text,
-                           const gcn::Color *const color,
-                           gcn::Font *const font, const bool outline) :
+                           const Color *const color,
+                           Font *const font, const bool outline) :
     Particle(),
     mText(text),
     mTextFont(font),
@@ -74,7 +74,7 @@ void TextParticle::draw(Graphics *const graphics,
                 / static_cast<float>(mFadeIn);
     }
 
-    gcn::Color color = *mColor;
+    Color color = *mColor;
     color.a = static_cast<int>(alpha);
 
     graphics->setColor(color);
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index eb8a160e1..ec586c3a9 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -32,8 +32,8 @@ class TextParticle final : public Particle
          * Constructor.
          */
         TextParticle(const std::string &text,
-                     const gcn::Color *const color,
-                     gcn::Font *const font, const bool outline = false);
+                     const Color *const color,
+                     Font *const font, const bool outline = false);
 
         A_DELETE_COPY(TextParticle)
 
@@ -53,8 +53,8 @@ class TextParticle final : public Particle
 
     private:
         std::string mText;             /**< Text of the particle. */
-        gcn::Font *mTextFont;          /**< Font used for drawing the text. */
-        const gcn::Color *mColor;      /**< Color used for drawing the text. */
+        Font *mTextFont;          /**< Font used for drawing the text. */
+        const Color *mColor;      /**< Color used for drawing the text. */
         int mTextWidth;
         bool mOutline;                 /**< Make the text better readable */
 };
diff --git a/src/party.h b/src/party.h
index 79fdfcf9e..c839168c7 100644
--- a/src/party.h
+++ b/src/party.h
@@ -22,7 +22,7 @@
 #ifndef PARTY_H
 #define PARTY_H
 
-#include "gui/widgets/avatarlistbox.h"
+#include "gui/models/avatarlistmodel.h"
 
 #include "utils/dtor.h"
 #include "utils/stringvector.h"
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 7e3687006..17f444eb8 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "render/graphics.h"
 
 #include "main.h"
@@ -48,11 +91,11 @@
 Graphics *mainGraphics = nullptr;
 
 Graphics::Graphics() :
-    gcn::Graphics(),
     mWidth(0),
     mHeight(0),
     mActualWidth(0),
     mActualHeight(0),
+    mClipStack(),
     mWindow(nullptr),
 #ifdef USE_SDL2
     mRenderer(nullptr),
@@ -503,3 +546,82 @@ void Graphics::setWindowSize(const int width A_UNUSED,
     SDL_SetWindowSize(mWindow, width, height);
 #endif
 }
+
+bool Graphics::pushClipArea(Rect area)
+{
+    // Ignore area with a negate width or height
+    // by simple pushing an empty clip area
+    // to the stack.
+    if (area.width < 0 || area.height < 0)
+    {
+        ClipRect carea;
+        mClipStack.push(carea);
+        return true;
+    }
+
+    if (mClipStack.empty())
+    {
+        ClipRect carea;
+        carea.x = area.x;
+        carea.y = area.y;
+        carea.width = area.width;
+        carea.height = area.height;
+        carea.xOffset = area.x;
+        carea.yOffset = area.y;
+        mClipStack.push(carea);
+        return true;
+    }
+
+    const ClipRect &top = mClipStack.top();
+    ClipRect carea;
+    carea = area;
+    carea.xOffset = top.xOffset + carea.x;
+    carea.yOffset = top.yOffset + carea.y;
+    carea.x += top.xOffset;
+    carea.y += top.yOffset;
+
+    // Clamp the pushed clip rectangle.
+    if (carea.x < top.x)
+        carea.x = top.x;
+
+    if (carea.y < top.y)
+        carea.y = top.y;
+
+    if (carea.x + carea.width > top.x + top.width)
+    {
+        carea.width = top.x + top.width - carea.x;
+
+        if (carea.width < 0)
+            carea.width = 0;
+    }
+
+    if (carea.y + carea.height > top.y + top.height)
+    {
+        carea.height = top.y + top.height - carea.y;
+
+        if (carea.height < 0)
+            carea.height = 0;
+    }
+
+    const bool result = carea.isIntersecting(top);
+
+    mClipStack.push(carea);
+
+    return result;
+}
+
+void Graphics::popClipArea()
+{
+    if (mClipStack.empty())
+        return;
+
+    mClipStack.pop();
+}
+
+const ClipRect *Graphics::getCurrentClipArea() const
+{
+    if (mClipStack.empty())
+        return nullptr;
+
+    return &mClipStack.top();
+}
diff --git a/src/render/graphics.h b/src/render/graphics.h
index 0cb510195..75b26a241 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef RENDER_GRAPHICS_H
 #define RENDER_GRAPHICS_H
 
@@ -27,15 +70,18 @@
 
 #include "sdlshared.h"
 
+#include "gui/color.h"
+
 #include "render/renderers.h"
 
-#include <guichan/color.hpp>
-#include <guichan/graphics.hpp>
+#include "gui/cliprect.h"
 
 #ifdef USE_SDL2
 #include <SDL_render.h>
 #endif
 
+#include <stack>
+
 #include "localconsts.h"
 
 class Image;
@@ -94,7 +140,7 @@ class ImageRect final
 /**
  * A central point of control for graphics.
  */
-class Graphics : public gcn::Graphics
+class Graphics
 {
     public:
         A_DELETE_COPY(Graphics)
@@ -104,6 +150,16 @@ class Graphics : public gcn::Graphics
          */
         virtual ~Graphics();
 
+        /**
+         * Alignments for text drawing.
+         */
+        enum Alignment
+        {
+            LEFT = 0,
+            CENTER,
+            RIGHT
+        };
+
         void setWindow(SDL_Window *const window,
                        const int width, const int height)
         {
@@ -145,14 +201,6 @@ class Graphics : public gcn::Graphics
          */
         virtual bool resizeScreen(const int width, const int height);
 
-        //  override unused abstract function
-        void drawImage(const gcn::Image* image A_UNUSED,
-                       int srcX A_UNUSED, int srcY A_UNUSED,
-                       int dstX A_UNUSED, int dstY A_UNUSED,
-                       int width A_UNUSED, int height A_UNUSED) override final
-        {
-        }
-
         /**
          * Draws a resclaled version of the image
          */
@@ -211,8 +259,7 @@ class Graphics : public gcn::Graphics
                                 const int w, const int h,
                                 const ImageRect &imgRect) = 0;
 
-        virtual void fillRectangle(const gcn::Rectangle& rectangle)
-                                   override = 0;
+        virtual void fillRectangle(const Rect& rectangle) = 0;
 
         /**
          * Updates the screen. This is done by either copying the buffer to the
@@ -246,10 +293,7 @@ class Graphics : public gcn::Graphics
                              const int x2, const int y2,
                              const int width, const int height);
 
-        const gcn::Font *getFont() const A_WARN_UNUSED
-        { return mFont; }
-
-        gcn::ClipRectangle &getTopClip() A_WARN_UNUSED
+        ClipRect &getTopClip() A_WARN_UNUSED
         { return mClipStack.top(); }
 
         void setRedraw(const bool n)
@@ -288,27 +332,27 @@ class Graphics : public gcn::Graphics
         virtual void initArrays()
         { }
 
-        void setColor(const gcn::Color &color) override
+        virtual void setColor(const Color &color)
         {
             mColor = color;
             mColor2 = color;
             mAlpha = (color.a != 255);
         }
 
-        void setColor2(const gcn::Color &color)
+        void setColor2(const Color &color)
         { mColor2 = color; }
 
-        void setColorAll(const gcn::Color &color, const gcn::Color &color2)
+        void setColorAll(const Color &color, const Color &color2)
         {
             mColor = color;
             mColor2 = color2;
             mAlpha = (color.a != 255);
         }
 
-        const gcn::Color &getColor() const override
+        const Color &getColor() const
         { return mColor; }
 
-        const gcn::Color &getColor2() const
+        const Color &getColor2() const
         { return mColor2; }
 
 #ifdef DEBUG_DRAW_CALLS
@@ -333,8 +377,8 @@ class Graphics : public gcn::Graphics
          * @return <code>true</code> if the image was blitted properly
          *         <code>false</code> otherwise.
          */
-        virtual bool drawImage2(const Image *const image,
-                                int dstX, int dstY) = 0;
+        virtual bool drawImage(const Image *const image,
+                               int dstX, int dstY) = 0;
 
         virtual void drawImageCached(const Image *const image,
                                      int srcX, int srcY) = 0;
@@ -353,6 +397,87 @@ class Graphics : public gcn::Graphics
 
         void setScale(int scale);
 
+        /**
+         * Pushes a clip area onto the stack. The x and y coordinates in the
+         * rectangle is  relative to the last pushed clip area.
+         * If the new area falls outside the current clip area, it will be
+         * clipped as necessary.
+         *
+         * If a clip area is outside of the top clip area a clip area with
+         * zero width and height will be pushed.
+         *
+         * @param area The clip area to be pushed onto the stack.
+         * @return False if the the new area lays outside the current clip 
+         *         area.
+         */
+        virtual bool pushClipArea(Rect area);
+
+        /**
+         * Removes the top most clip area from the stack.
+         *
+         * @throws Exception if the stack is empty.
+         */
+        virtual void popClipArea();
+
+        /**
+         * Ddraws a line.
+         *
+         * @param x1 The first x coordinate.
+         * @param y1 The first y coordinate.
+         * @param x2 The second x coordinate.
+         * @param y2 The second y coordinate.
+         */
+        virtual void drawLine(int x1, int y1, int x2, int y2) = 0;
+
+        /**
+         * Draws a simple, non-filled, rectangle with a one pixel width.
+         *
+         * @param rectangle The rectangle to draw.
+         */
+        virtual void drawRectangle(const Rect &rectangle) = 0;
+
+        /**
+         * Gets the current clip area. Usefull if you want to do drawing
+         * bypassing Graphics.
+         *
+         * @return The current clip area.
+         */
+        virtual const ClipRect *getCurrentClipArea() const;
+
+        /**
+         * Draws a single point/pixel.
+         *
+         * @param x The x coordinate.
+         * @param y The y coordinate.
+         */
+        virtual void drawPoint(int x, int y) = 0;
+
+        /**
+          * Initializes drawing. Called by the Gui when Gui::draw() is called.
+          * It is needed by some implementations of Graphics to perform
+          * preparations before drawing. An example of such an implementation
+          * is the OpenGLGraphics.
+          *
+          * NOTE: You will never need to call this function yourself, unless
+          *       you use a Graphics object outside of Guichan.
+          *
+          * @see _endDraw, Gui::draw
+          */
+        virtual void _beginDraw()
+        { }
+
+        /**
+          * Deinitializes drawing. Called by the Gui when a Gui::draw() is done.
+          * done. It should reset any state changes made by _beginDraw().
+          *
+          * NOTE: You will never need to call this function yourself, unless
+          *       you use a Graphics object outside of Guichan.
+          *
+          * @see _beginDraw, Gui::draw
+          */
+        virtual void _endDraw()
+        { }
+
         int mWidth;
         int mHeight;
         int mActualWidth;
@@ -382,6 +507,11 @@ class Graphics : public gcn::Graphics
 
         bool videoInfo();
 
+        /**
+         * Holds the clip area stack.
+         */
+        std::stack<ClipRect> mClipStack;
+
         SDL_Window *mWindow;
 
 #ifdef USE_SDL2
@@ -405,8 +535,8 @@ class Graphics : public gcn::Graphics
         int mStartFreeMem;
         bool mSync;
         int mScale;
-        gcn::Color mColor;
-        gcn::Color mColor2;
+        Color mColor;
+        Color mColor2;
 };
 
 extern Graphics *mainGraphics;
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 82bf04dc8..86707fac8 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -219,8 +219,8 @@ static inline void drawRescaledQuad(const Image *const image,
     }
 }
 
-bool MobileOpenGLGraphics::drawImage2(const Image *const image,
-                                      int dstX, int dstY)
+bool MobileOpenGLGraphics::drawImage(const Image *const image,
+                                     int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -228,7 +228,7 @@ bool MobileOpenGLGraphics::drawImage2(const Image *const image,
 bool MobileOpenGLGraphics::drawImageInline(const Image *const image,
                                            int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
@@ -884,7 +884,7 @@ void MobileOpenGLGraphics::_beginDraw()
 
 //    glScalef(0.5F, 0.5F, 0.5F);
 
-    pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
+    pushClipArea(Rect(0, 0, mRect.w, mRect.h));
 }
 
 void MobileOpenGLGraphics::_endDraw()
@@ -951,21 +951,21 @@ SDL_Surface* MobileOpenGLGraphics::getScreenshot()
     return screenshot;
 }
 
-bool MobileOpenGLGraphics::pushClipArea(gcn::Rectangle area)
+bool MobileOpenGLGraphics::pushClipArea(Rect area)
 {
     int transX = 0;
     int transY = 0;
 
     if (!mClipStack.empty())
     {
-        const gcn::ClipRectangle &clipArea = mClipStack.top();
+        const ClipRect &clipArea = mClipStack.top();
         transX = -clipArea.xOffset;
         transY = -clipArea.yOffset;
     }
 
-    const bool result = gcn::Graphics::pushClipArea(area);
+    const bool result = Graphics::pushClipArea(area);
 
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
     transX += clipArea.xOffset;
     transY += clipArea.yOffset;
 
@@ -986,16 +986,16 @@ void MobileOpenGLGraphics::popClipArea()
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &clipArea1 = mClipStack.top();
+    const ClipRect &clipArea1 = mClipStack.top();
     int transX = -clipArea1.xOffset;
     int transY = -clipArea1.yOffset;
 
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
     transX += clipArea.xOffset;
     transY += clipArea.yOffset;
     if (transX || transY)
@@ -1040,12 +1040,12 @@ void MobileOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
     drawLineArrays(4);
 }
 
-void MobileOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect)
+void MobileOpenGLGraphics::drawRectangle(const Rect& rect)
 {
     drawRectangle(rect, false);
 }
 
-void MobileOpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
+void MobileOpenGLGraphics::fillRectangle(const Rect& rect)
 {
     drawRectangle(rect, true);
 }
@@ -1090,7 +1090,7 @@ void MobileOpenGLGraphics::setTexturingAndBlending(const bool enable)
     }
 }
 
-void MobileOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect,
+void MobileOpenGLGraphics::drawRectangle(const Rect& rect,
                                          const bool filled)
 {
     BLOCK_START("Graphics::drawRectangle")
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index f665f743b..0b9cd83e2 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -127,7 +127,7 @@ class MobileOpenGLGraphics final : public Graphics
         bool mTexture;
 
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         GLuint mImageCached;
         float mFloatColor;
         int mMaxVertices;
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index e8e1a2116..6bc25be32 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -286,8 +286,8 @@ static inline void drawRescaledQuad(const Image *const image,
     }
 }
 
-bool NormalOpenGLGraphics::drawImage2(const Image *const image,
-                                      int dstX, int dstY)
+bool NormalOpenGLGraphics::drawImage(const Image *const image,
+                                     int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -295,7 +295,7 @@ bool NormalOpenGLGraphics::drawImage2(const Image *const image,
 bool NormalOpenGLGraphics::drawImageInline(const Image *const image,
                                            int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
@@ -1145,7 +1145,7 @@ void NormalOpenGLGraphics::_beginDraw()
 #endif
 #endif
 
-    pushClipArea(gcn::Rectangle(0, 0, w, h));
+    pushClipArea(Rect(0, 0, w, h));
 }
 
 void NormalOpenGLGraphics::_endDraw()
@@ -1211,21 +1211,21 @@ SDL_Surface* NormalOpenGLGraphics::getScreenshot()
     return screenshot;
 }
 
-bool NormalOpenGLGraphics::pushClipArea(gcn::Rectangle area)
+bool NormalOpenGLGraphics::pushClipArea(Rect area)
 {
     int transX = 0;
     int transY = 0;
 
     if (!mClipStack.empty())
     {
-        const gcn::ClipRectangle &clipArea = mClipStack.top();
+        const ClipRect &clipArea = mClipStack.top();
         transX = -clipArea.xOffset;
         transY = -clipArea.yOffset;
     }
 
-    const bool result = gcn::Graphics::pushClipArea(area);
+    const bool result = Graphics::pushClipArea(area);
 
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
     transX += clipArea.xOffset;
     transY += clipArea.yOffset;
 
@@ -1247,16 +1247,16 @@ void NormalOpenGLGraphics::popClipArea()
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &clipArea1 = mClipStack.top();
+    const ClipRect &clipArea1 = mClipStack.top();
     int transX = -clipArea1.xOffset;
     int transY = -clipArea1.yOffset;
 
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
     transX += clipArea.xOffset;
     transY += clipArea.yOffset;
     if (transX || transY)
@@ -1297,12 +1297,12 @@ void NormalOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
     drawLineArrayf(4);
 }
 
-void NormalOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect)
+void NormalOpenGLGraphics::drawRectangle(const Rect& rect)
 {
     drawRectangle(rect, false);
 }
 
-void NormalOpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
+void NormalOpenGLGraphics::fillRectangle(const Rect& rect)
 {
     drawRectangle(rect, true);
 }
@@ -1347,7 +1347,7 @@ void NormalOpenGLGraphics::setTexturingAndBlending(const bool enable)
     }
 }
 
-void NormalOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect,
+void NormalOpenGLGraphics::drawRectangle(const Rect& rect,
                                          const bool filled)
 {
     BLOCK_START("Graphics::drawRectangle")
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 882ff5ed8..214954e3c 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -143,7 +143,7 @@ class NormalOpenGLGraphics final : public Graphics
         bool mTexture;
 
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         GLuint mImageCached;
         float mFloatColor;
         int mMaxVertices;
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index 3ea1e4182..d09d7b13b 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -139,8 +139,8 @@ static inline void drawRescaledQuad(const Image *const image A_UNUSED,
     }
 }
 
-bool NullOpenGLGraphics::drawImage2(const Image *const image,
-                                    int dstX, int dstY)
+bool NullOpenGLGraphics::drawImage(const Image *const image,
+                                   int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -148,7 +148,7 @@ bool NullOpenGLGraphics::drawImage2(const Image *const image,
 bool NullOpenGLGraphics::drawImageInline(const Image *const image,
                                          int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
@@ -918,7 +918,7 @@ void NullOpenGLGraphics::updateScreen()
 
 void NullOpenGLGraphics::_beginDraw()
 {
-    pushClipArea(gcn::Rectangle(0, 0, 640, 480));
+    pushClipArea(Rect(0, 0, 640, 480));
 }
 
 void NullOpenGLGraphics::_endDraw()
@@ -935,21 +935,21 @@ SDL_Surface* NullOpenGLGraphics::getScreenshot()
     return nullptr;
 }
 
-bool NullOpenGLGraphics::pushClipArea(gcn::Rectangle area)
+bool NullOpenGLGraphics::pushClipArea(Rect area)
 {
     int transX = 0;
     int transY = 0;
 
     if (!mClipStack.empty())
     {
-        const gcn::ClipRectangle &clipArea = mClipStack.top();
+        const ClipRect &clipArea = mClipStack.top();
         transX = -clipArea.xOffset;
         transY = -clipArea.yOffset;
     }
 
-    const bool result = gcn::Graphics::pushClipArea(area);
+    const bool result = Graphics::pushClipArea(area);
 
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
     transX += clipArea.xOffset;
     transY += clipArea.yOffset;
 
@@ -958,7 +958,7 @@ bool NullOpenGLGraphics::pushClipArea(gcn::Rectangle area)
 
 void NullOpenGLGraphics::popClipArea()
 {
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
@@ -984,12 +984,12 @@ void NullOpenGLGraphics::drawLine(int x1, int y1,
     drawLineArrayf(4);
 }
 
-void NullOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect)
+void NullOpenGLGraphics::drawRectangle(const Rect& rect)
 {
     drawRectangle(rect, false);
 }
 
-void NullOpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
+void NullOpenGLGraphics::fillRectangle(const Rect& rect)
 {
     drawRectangle(rect, true);
 }
@@ -1017,7 +1017,7 @@ void NullOpenGLGraphics::setTexturingAndBlending(const bool enable)
     }
 }
 
-void NullOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect A_UNUSED,
+void NullOpenGLGraphics::drawRectangle(const Rect& rect A_UNUSED,
                                        const bool filled A_UNUSED)
 {
     BLOCK_START("Graphics::drawRectangle")
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index cbab0614d..ee2a5d189 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -130,7 +130,7 @@ class NullOpenGLGraphics final : public Graphics
         bool mTexture;
 
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         float mFloatColor;
         int mMaxVertices;
         bool mColorAlpha;
diff --git a/src/render/openglgraphicsdef.hpp b/src/render/openglgraphicsdef.hpp
index 89f8e63a9..5e8e3390c 100644
--- a/src/render/openglgraphicsdef.hpp
+++ b/src/render/openglgraphicsdef.hpp
@@ -88,18 +88,18 @@
 
         void _endDraw() override final;
 
-        bool pushClipArea(gcn::Rectangle area) override final;
+        bool pushClipArea(Rect area) override final;
 
         void popClipArea() override final;
 
-        void setColor(const gcn::Color &color) override final
+        void setColor(const Color &color) override final
         {
             mColor = color;
             mColor2 = color;
             mColorAlpha = (color.a != 255);
         }
 
-        void setColorAll(const gcn::Color &color, const gcn::Color &color2)
+        void setColorAll(const Color &color, const Color &color2)
         {
             mColor = color;
             mColor2 = color2;
@@ -110,12 +110,12 @@
 
         void drawLine(int x1, int y1, int x2, int y2) override final;
 
-        void drawRectangle(const gcn::Rectangle &rect,
+        void drawRectangle(const Rect &rect,
                            const bool filled);
 
-        void drawRectangle(const gcn::Rectangle &rect) override final;
+        void drawRectangle(const Rect &rect) override final;
 
-        void fillRectangle(const gcn::Rectangle &rect) override final;
+        void fillRectangle(const Rect &rect) override final;
 
         static void dumpSettings();
 
@@ -130,8 +130,8 @@
 
         void updateTextureFormat();
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index bf9334655..faf2de76e 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -142,8 +142,8 @@ static inline void drawRescaledQuad(const Image *const image,
     }
 }
 
-bool SafeOpenGLGraphics::drawImage2(const Image *const image,
-                                    int dstX, int dstY)
+bool SafeOpenGLGraphics::drawImage(const Image *const image,
+                                   int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -151,7 +151,7 @@ bool SafeOpenGLGraphics::drawImage2(const Image *const image,
 bool SafeOpenGLGraphics::drawImageInline(const Image *const image,
                                          int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     if (!image)
         return false;
 
@@ -459,7 +459,7 @@ void SafeOpenGLGraphics::_beginDraw()
 
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
+    pushClipArea(Rect(0, 0, mRect.w, mRect.h));
 }
 
 void SafeOpenGLGraphics::_endDraw()
@@ -523,21 +523,21 @@ SDL_Surface* SafeOpenGLGraphics::getScreenshot()
     return screenshot;
 }
 
-bool SafeOpenGLGraphics::pushClipArea(gcn::Rectangle area)
+bool SafeOpenGLGraphics::pushClipArea(Rect area)
 {
     int transX = 0;
     int transY = 0;
 
     if (!mClipStack.empty())
     {
-        const gcn::ClipRectangle &clipArea = mClipStack.top();
+        const ClipRect &clipArea = mClipStack.top();
         transX = -clipArea.xOffset;
         transY = -clipArea.yOffset;
     }
 
-    const bool result = gcn::Graphics::pushClipArea(area);
+    const bool result = Graphics::pushClipArea(area);
 
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
 
     glPushMatrix();
     glTranslatef(static_cast<GLfloat>(transX + clipArea.xOffset),
@@ -551,13 +551,13 @@ bool SafeOpenGLGraphics::pushClipArea(gcn::Rectangle area)
 
 void SafeOpenGLGraphics::popClipArea()
 {
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
 
     glPopMatrix();
-    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    const ClipRect &clipArea = mClipStack.top();
     glScissor(clipArea.x * mScale,
         (mRect.h - clipArea.y - clipArea.height) * mScale,
         clipArea.width * mScale,
@@ -613,12 +613,12 @@ void SafeOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
     glEnd();
 }
 
-void SafeOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect)
+void SafeOpenGLGraphics::drawRectangle(const Rect& rect)
 {
     drawRectangle(rect, false);
 }
 
-void SafeOpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
+void SafeOpenGLGraphics::fillRectangle(const Rect& rect)
 {
     drawRectangle(rect, true);
 }
@@ -661,7 +661,7 @@ void SafeOpenGLGraphics::setTexturingAndBlending(const bool enable)
     }
 }
 
-void SafeOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect,
+void SafeOpenGLGraphics::drawRectangle(const Rect& rect,
                                        const bool filled)
 {
     BLOCK_START("Graphics::drawRectangle")
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 28d61b59a..fbb156c6c 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -90,7 +90,7 @@ class SafeOpenGLGraphics final : public Graphics
 
         bool mTexture;
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         float mFloatColor;
         bool mColorAlpha;
         FBOInfo mFbo;
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index 97f231d08..8c78c8cdd 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifdef USE_SDL2
 
 #include "render/sdl2graphics.h"
@@ -31,12 +74,13 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/sdl2imagehelper.h"
 
 #include "utils/sdlcheckutils.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
+#include "utils/sdlpixel.h"
 
 #include "debug.h"
 
@@ -92,7 +136,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image,
     if (!image->mTexture)
         return false;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
     const SDL_Rect srcRect =
     {
@@ -113,8 +157,8 @@ bool SDLGraphics::drawRescaledImage(const Image *const image,
         &srcRect, &dstRect) < 0);
 }
 
-bool SDLGraphics::drawImage2(const Image *const image,
-                             int dstX, int dstY)
+bool SDLGraphics::drawImage(const Image *const image,
+                            int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -122,12 +166,12 @@ bool SDLGraphics::drawImage2(const Image *const image,
 bool SDLGraphics::drawImageInline(const Image *const image,
                                   int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mWindow || !image || !image->mTexture)
         return false;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return false;
 
@@ -159,7 +203,7 @@ void SDLGraphics::drawImageCached(const Image *const image,
     if (!mWindow || !image || !image->mTexture)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return;
 
@@ -194,7 +238,7 @@ void SDLGraphics::drawPatternCached(const Image *const image,
     if (!image->mTexture)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return;
 
@@ -252,7 +296,7 @@ void SDLGraphics::drawPatternInline(const Image *const image,
     if (!image->mTexture)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return;
 
@@ -303,7 +347,7 @@ void SDLGraphics::drawRescaledPattern(const Image *const image,
     if (scaledHeight == 0 || scaledWidth == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return;
 
@@ -363,7 +407,7 @@ void SDLGraphics::calcPatternInline(ImageVertexes* const vert,
     if (!vert || !mWindow || !image || !image->mTexture)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return;
 
@@ -448,7 +492,7 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const
     if (!vert || !vert->image || !vert->image->mTexture)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     if (!top.width || !top.height)
         return;
 
@@ -594,9 +638,9 @@ void SDLGraphics::calcWindow(ImageCollection *const vertCol,
     calcImageRect(vert, x, y, w, h, imgRect);
 }
 
-void SDLGraphics::fillRectangle(const gcn::Rectangle &rectangle)
+void SDLGraphics::fillRectangle(const Rect &rectangle)
 {
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int32_t>(rectangle.x + top.xOffset),
@@ -611,7 +655,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle &rectangle)
 
 void SDLGraphics::_beginDraw()
 {
-    pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
+    pushClipArea(Rect(0, 0, mRect.w, mRect.h));
 }
 
 void SDLGraphics::_endDraw()
@@ -619,11 +663,11 @@ void SDLGraphics::_endDraw()
     popClipArea();
 }
 
-bool SDLGraphics::pushClipArea(gcn::Rectangle area)
+bool SDLGraphics::pushClipArea(Rect area)
 {
-    const bool result = gcn::Graphics::pushClipArea(area);
+    const bool result = Graphics::pushClipArea(area);
 
-    const gcn::ClipRectangle &carea = mClipStack.top();
+    const ClipRect &carea = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int32_t>(carea.x),
@@ -637,12 +681,12 @@ bool SDLGraphics::pushClipArea(gcn::Rectangle area)
 
 void SDLGraphics::popClipArea()
 {
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &carea = mClipStack.top();
+    const ClipRect &carea = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int32_t>(carea.x),
@@ -659,7 +703,7 @@ void SDLGraphics::drawPoint(int x, int y)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
 
     x += top.xOffset;
     y += top.yOffset;
@@ -678,9 +722,9 @@ void SDLGraphics::drawPoint(int x, int y)
 }
 
 
-void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle)
+void SDLGraphics::drawRectangle(const Rect &rectangle)
 {
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
 
     SDL_SetRenderDrawColor(mRenderer, mColor.r, mColor.g, mColor.b, mColor.a);
 
@@ -702,7 +746,7 @@ void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle)
 
 void SDLGraphics::drawLine(int x1, int y1, int x2, int y2)
 {
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
 
     SDL_SetRenderDrawColor(mRenderer, mColor.r, mColor.g, mColor.b, mColor.a);
 
diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h
index c4e0d74a7..9f604d9b5 100644
--- a/src/render/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef RENDER_SDL2GRAPHICS_H
 #define RENDER_SDL2GRAPHICS_H
 
@@ -58,7 +101,7 @@ class SDLGraphics final : public Graphics
 
         void _endDraw() override final;
 
-        bool pushClipArea(gcn::Rectangle rect) override final;
+        bool pushClipArea(Rect rect) override final;
 
         void popClipArea() override final;
 
@@ -120,9 +163,9 @@ class SDLGraphics final : public Graphics
                         const int w, const int h,
                         const ImageRect &imgRect) override final;
 
-        void fillRectangle(const gcn::Rectangle &rect) override final;
+        void fillRectangle(const Rect &rect) override final;
 
-        void drawRectangle(const gcn::Rectangle &rect) override final;
+        void drawRectangle(const Rect &rect) override final;
 
         void drawPoint(int x, int y) override final;
 
@@ -139,8 +182,8 @@ class SDLGraphics final : public Graphics
         void setRendererFlags(const uint32_t flags)
         { mRendererFlags = flags; }
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
@@ -161,7 +204,7 @@ class SDLGraphics final : public Graphics
     protected:
         uint32_t mRendererFlags;
         uint32_t mOldPixel;
-        int mOldAlpha;
+        unsigned int mOldAlpha;
 
     private:
         void inline calcImageRect(ImageVertexes *const vert,
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 22a66a911..0844cd52e 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -31,12 +31,13 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/sdl2softwareimagehelper.h"
 
 #include "utils/sdlcheckutils.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
+#include "utils/sdlpixel.h"
 
 #include "debug.h"
 
@@ -81,7 +82,7 @@ bool SDL2SoftwareGraphics::drawRescaledImage(const Image *const image,
     if (!tmpImage->mSDLSurface)
         return false;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     SDL_Rect srcRect =
@@ -108,8 +109,8 @@ bool SDL2SoftwareGraphics::drawRescaledImage(const Image *const image,
     return returnValue;
 }
 
-bool SDL2SoftwareGraphics::drawImage2(const Image *const image,
-                                      int dstX, int dstY)
+bool SDL2SoftwareGraphics::drawImage(const Image *const image,
+                                     int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -117,12 +118,12 @@ bool SDL2SoftwareGraphics::drawImage2(const Image *const image,
 bool SDL2SoftwareGraphics::drawImageInline(const Image *const image,
                                            int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mSurface || !image || !image->mSDLSurface)
         return false;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     SDL_Surface *const src = image->mSDLSurface;
@@ -210,7 +211,7 @@ void SDL2SoftwareGraphics::drawImageCached(const Image *const image,
     if (!mSurface || !image || !image->mSDLSurface)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     SDL_Surface *const src = image->mSDLSurface;
@@ -306,7 +307,7 @@ void SDL2SoftwareGraphics::drawPatternCached(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -427,7 +428,7 @@ void SDL2SoftwareGraphics::drawPatternInline(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -546,7 +547,7 @@ void SDL2SoftwareGraphics::drawRescaledPattern(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -609,7 +610,7 @@ void SDL2SoftwareGraphics::calcPatternInline(ImageVertexes* const vert,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -694,7 +695,7 @@ void SDL2SoftwareGraphics::calcTileSDL(ImageVertexes *const vert,
         return;
 
     const Image *const image = vert->image;
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     DoubleRect *rect = new DoubleRect();
@@ -916,15 +917,15 @@ int SDL2SoftwareGraphics::SDL_FakeUpperBlit(const SDL_Surface *const src,
     return 0;
 }
 
-void SDL2SoftwareGraphics::fillRectangle(const gcn::Rectangle &rectangle)
+void SDL2SoftwareGraphics::fillRectangle(const Rect &rectangle)
 {
     FUNC_BLOCK("Graphics::fillRectangle", 1)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
-    gcn::Rectangle area = rectangle;
+    Rect area = rectangle;
     area.x += top.xOffset;
     area.y += top.yOffset;
 
@@ -967,7 +968,7 @@ void SDL2SoftwareGraphics::fillRectangle(const gcn::Rectangle &rectangle)
                     for (x = x1; x < x2; x++)
                     {
                         uint8_t *const p = p0 + x * 2;
-                        *reinterpret_cast<uint16_t *>(p) = gcn::SDLAlpha16(
+                        *reinterpret_cast<uint16_t *>(p) = SDLAlpha16(
                             static_cast<uint16_t>(pixel),
                             *reinterpret_cast<uint16_t *>(p),
                             static_cast<uint8_t>(mColor.a), mSurface->format);
@@ -1116,7 +1117,7 @@ void SDL2SoftwareGraphics::fillRectangle(const gcn::Rectangle &rectangle)
 
 void SDL2SoftwareGraphics::_beginDraw()
 {
-    pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
+    pushClipArea(Rect(0, 0, mRect.w, mRect.h));
 }
 
 void SDL2SoftwareGraphics::_endDraw()
@@ -1124,11 +1125,11 @@ void SDL2SoftwareGraphics::_endDraw()
     popClipArea();
 }
 
-bool SDL2SoftwareGraphics::pushClipArea(gcn::Rectangle area)
+bool SDL2SoftwareGraphics::pushClipArea(Rect area)
 {
-    const bool result = gcn::Graphics::pushClipArea(area);
+    const bool result = Graphics::pushClipArea(area);
 
-    const gcn::ClipRectangle &carea = mClipStack.top();
+    const ClipRect &carea = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int32_t>(carea.x),
@@ -1142,12 +1143,12 @@ bool SDL2SoftwareGraphics::pushClipArea(gcn::Rectangle area)
 
 void SDL2SoftwareGraphics::popClipArea()
 {
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &carea = mClipStack.top();
+    const ClipRect &carea = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int32_t>(carea.x),
@@ -1164,7 +1165,7 @@ void SDL2SoftwareGraphics::drawPoint(int x, int y)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
     x += top.xOffset;
     y += top.yOffset;
@@ -1183,7 +1184,7 @@ void SDL2SoftwareGraphics::drawHLine(int x1, int y, int x2)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
     const int xOffset = top.xOffset;
     x1 += xOffset;
@@ -1309,7 +1310,7 @@ void SDL2SoftwareGraphics::drawVLine(int x, int y1, int y2)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
     const int yOffset = top.yOffset;
     x += top.xOffset;
@@ -1439,7 +1440,7 @@ void SDL2SoftwareGraphics::drawVLine(int x, int y1, int y2)
     SDL_UnlockSurface(mSurface);
 }
 
-void SDL2SoftwareGraphics::drawRectangle(const gcn::Rectangle &rectangle)
+void SDL2SoftwareGraphics::drawRectangle(const Rect &rectangle)
 {
     const int x1 = rectangle.x;
     const int x2 = x1 + rectangle.width - 1;
diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h
index 3ac6cb212..6ef750dbd 100644
--- a/src/render/sdl2softwaregraphics.h
+++ b/src/render/sdl2softwaregraphics.h
@@ -58,7 +58,7 @@ class SDL2SoftwareGraphics final : public Graphics
 
         void _endDraw();
 
-        bool pushClipArea(gcn::Rectangle rect);
+        bool pushClipArea(Rect rect);
 
         void popClipArea();
 
@@ -120,9 +120,9 @@ class SDL2SoftwareGraphics final : public Graphics
                         const int w, const int h,
                         const ImageRect &imgRect) override final;
 
-        void fillRectangle(const gcn::Rectangle &rect) override final;
+        void fillRectangle(const Rect &rect) override final;
 
-        void drawRectangle(const gcn::Rectangle &rect) override final;
+        void drawRectangle(const Rect &rect) override final;
 
         void drawPoint(int x, int y) override final;
 
@@ -141,8 +141,8 @@ class SDL2SoftwareGraphics final : public Graphics
 
         bool resizeScreen(const int width, const int height) override final;
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
@@ -173,7 +173,7 @@ class SDL2SoftwareGraphics final : public Graphics
         uint32_t mRendererFlags;
         SDL_Surface *mSurface;
         uint32_t mOldPixel;
-        int mOldAlpha;
+        unsigned int mOldAlpha;
 
     private:
         void inline calcImageRect(ImageVertexes *const vert,
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index e0e22cac9..44dcc426d 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -31,7 +31,9 @@
 
 #include "utils/sdlcheckutils.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
+#include "utils/sdlpixel.h"
+
+#include "resources/image.h"
 
 #include "debug.h"
 
@@ -74,7 +76,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image,
     if (!tmpImage->mSDLSurface)
         return false;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     SDL_Rect srcRect =
@@ -101,8 +103,8 @@ bool SDLGraphics::drawRescaledImage(const Image *const image,
     return returnValue;
 }
 
-bool SDLGraphics::drawImage2(const Image *const image,
-                             int dstX, int dstY)
+bool SDLGraphics::drawImage(const Image *const image,
+                            int dstX, int dstY)
 {
     return drawImageInline(image, dstX, dstY);
 }
@@ -110,12 +112,12 @@ bool SDLGraphics::drawImage2(const Image *const image,
 bool SDLGraphics::drawImageInline(const Image *const image,
                                   int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mWindow || !image || !image->mSDLSurface)
         return false;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     SDL_Surface *const src = image->mSDLSurface;
@@ -203,7 +205,7 @@ void SDLGraphics::drawImageCached(const Image *const image,
     if (!mWindow || !image || !image->mSDLSurface)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     SDL_Surface *const src = image->mSDLSurface;
@@ -299,7 +301,7 @@ void SDLGraphics::drawPatternCached(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -420,7 +422,7 @@ void SDLGraphics::drawPatternInline(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -539,7 +541,7 @@ void SDLGraphics::drawRescaledPattern(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -602,7 +604,7 @@ void SDLGraphics::calcPatternInline(ImageVertexes* const vert,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -686,7 +688,7 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const
         return;
 
     const Image *const image = vert->image;
-    const gcn::ClipRectangle &top = mClipStack.top();
+    const ClipRect &top = mClipStack.top();
     const SDL_Rect &bounds = image->mBounds;
 
     DoubleRect *rect = new DoubleRect();
@@ -912,15 +914,15 @@ int SDLGraphics::SDL_FakeUpperBlit(const SDL_Surface *const src,
     return 0;
 }
 
-void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle)
+void SDLGraphics::fillRectangle(const Rect& rectangle)
 {
     FUNC_BLOCK("Graphics::fillRectangle", 1)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
-    gcn::Rectangle area = rectangle;
+    Rect area = rectangle;
     area.x += top.xOffset;
     area.y += top.yOffset;
 
@@ -963,7 +965,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle)
                     for (x = x1; x < x2; x++)
                     {
                         uint8_t *const p = p0 + x * 2;
-                        *reinterpret_cast<uint16_t *>(p) = gcn::SDLAlpha16(
+                        *reinterpret_cast<uint16_t *>(p) = SDLAlpha16(
                             static_cast<uint16_t>(pixel),
                             *reinterpret_cast<uint16_t *>(p),
                             static_cast<uint8_t>(mColor.a), mWindow->format);
@@ -1112,7 +1114,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle)
 
 void SDLGraphics::_beginDraw()
 {
-    pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
+    pushClipArea(Rect(0, 0, mRect.w, mRect.h));
 }
 
 void SDLGraphics::_endDraw()
@@ -1120,10 +1122,10 @@ void SDLGraphics::_endDraw()
     popClipArea();
 }
 
-bool SDLGraphics::pushClipArea(gcn::Rectangle area)
+bool SDLGraphics::pushClipArea(Rect area)
 {
-    const bool result = gcn::Graphics::pushClipArea(area);
-    const gcn::ClipRectangle &carea = mClipStack.top();
+    const bool result = Graphics::pushClipArea(area);
+    const ClipRect &carea = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int16_t>(carea.x),
@@ -1138,12 +1140,12 @@ bool SDLGraphics::pushClipArea(gcn::Rectangle area)
 
 void SDLGraphics::popClipArea()
 {
-    gcn::Graphics::popClipArea();
+    Graphics::popClipArea();
 
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle &carea = mClipStack.top();
+    const ClipRect &carea = mClipStack.top();
     const SDL_Rect rect =
     {
         static_cast<int16_t>(carea.x),
@@ -1160,7 +1162,7 @@ void SDLGraphics::drawPoint(int x, int y)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
     x += top.xOffset;
     y += top.yOffset;
@@ -1179,7 +1181,7 @@ void SDLGraphics::drawHLine(int x1, int y, int x2)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
     const int xOffset = top.xOffset;
     x1 += xOffset;
@@ -1305,7 +1307,7 @@ void SDLGraphics::drawVLine(int x, int y1, int y2)
     if (mClipStack.empty())
         return;
 
-    const gcn::ClipRectangle& top = mClipStack.top();
+    const ClipRect& top = mClipStack.top();
 
     const int yOffset = top.yOffset;
     x += top.xOffset;
@@ -1435,7 +1437,7 @@ void SDLGraphics::drawVLine(int x, int y1, int y2)
     SDL_UnlockSurface(mWindow);
 }
 
-void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle)
+void SDLGraphics::drawRectangle(const Rect &rectangle)
 {
     const int x1 = rectangle.x;
     const int x2 = x1 + rectangle.width - 1;
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index 17b54db92..170c0010b 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -58,7 +58,7 @@ class SDLGraphics final : public Graphics
 
         void _endDraw() override final;
 
-        bool pushClipArea(gcn::Rectangle rect) override final;
+        bool pushClipArea(Rect rect) override final;
 
         void popClipArea() override final;
 
@@ -120,9 +120,9 @@ class SDLGraphics final : public Graphics
                         const int w, const int h,
                         const ImageRect &imgRect) override final;
 
-        void fillRectangle(const gcn::Rectangle &rect) override final;
+        void fillRectangle(const Rect &rect) override final;
 
-        void drawRectangle(const gcn::Rectangle &rect) override final;
+        void drawRectangle(const Rect &rect) override final;
 
         void drawPoint(int x, int y) override final;
 
@@ -136,8 +136,8 @@ class SDLGraphics final : public Graphics
                           const bool resize,
                           const bool noFrame) override final;
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
@@ -166,7 +166,7 @@ class SDLGraphics final : public Graphics
         void drawVLine(int x, int y1, int y2);
 
         uint32_t mOldPixel;
-        int mOldAlpha;
+        unsigned int mOldAlpha;
 
     private:
         void inline calcImageRect(ImageVertexes *const vert,
diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index 8834bb171..e6aee752f 100644
--- a/src/render/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -42,10 +42,10 @@ SurfaceGraphics::~SurfaceGraphics()
 {
 }
 
-bool SurfaceGraphics::drawImage2(const Image *const image,
-                                 int dstX, int dstY)
+bool SurfaceGraphics::drawImage(const Image *const image,
+                                int dstX, int dstY)
 {
-    FUNC_BLOCK("Graphics::drawImage2", 1)
+    FUNC_BLOCK("Graphics::drawImage", 1)
     // Check that preconditions for blitting are met.
     if (!mTarget || !image || !image->mSDLSurface)
         return false;
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index c3e6cb2ee..8e85356da 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -63,7 +63,7 @@ class SurfaceGraphics final : public Graphics
         void _endDraw() override final
         { }
 
-        bool pushClipArea(gcn::Rectangle rect A_UNUSED) override final
+        bool pushClipArea(Rect rect A_UNUSED) override final
         { return true; }
 
         void popClipArea() override final
@@ -158,10 +158,10 @@ class SurfaceGraphics final : public Graphics
         BlitMode getBlitMode() const A_WARN_UNUSED
         { return mBlitMode; }
 
-        void fillRectangle(const gcn::Rectangle &rect A_UNUSED) override final
+        void fillRectangle(const Rect &rect A_UNUSED) override final
         { }
 
-        void drawRectangle(const gcn::Rectangle &rect A_UNUSED) override final
+        void drawRectangle(const Rect &rect A_UNUSED) override final
         { }
 
         void drawPoint(int x A_UNUSED, int y A_UNUSED) override final
@@ -179,8 +179,8 @@ class SurfaceGraphics final : public Graphics
                           const bool noFrame A_UNUSED) override final
         { return false; }
 
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
+        bool drawImage(const Image *const image,
+                       int dstX, int dstY) override final;
 
         void drawImageCached(const Image *const image,
                              int x, int y) override final;
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index 71a6382dc..870de40a9 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -250,7 +250,7 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas)
 #else
                 SDL_SetAlpha(image->mSDLSurface, 0, SDL_ALPHA_OPAQUE);
 #endif
-                graphics->drawImage2(image, item->x, item->y);
+                graphics->drawImage(image, item->x, item->y);
             }
         }
     }
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 9b9112f0f..7bdbeb33d 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -68,14 +68,8 @@ void MonsterDB::loadXmlFile(const std::string &fileName)
         return;
     }
 
-#ifdef MANASERV_SUPPORT
-    const int offset = XML::getProperty(rootNode, "offset",
-        Net::getNetworkType() != ServerInfo::MANASERV
-        ? OLD_TMWATHENA_OFFSET : 0);
-#else
     const int offset = XML::getProperty(rootNode,
         "offset", OLD_TMWATHENA_OFFSET);
-#endif
 
     // iterate <monster>s
     for_each_xml_child_node(monsterNode, rootNode)
diff --git a/src/resources/db/weaponsdb.cpp b/src/resources/db/weaponsdb.cpp
new file mode 100644
index 000000000..6e8e4ce1f
--- /dev/null
+++ b/src/resources/db/weaponsdb.cpp
@@ -0,0 +1,76 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/db/weaponsdb.h"
+
+#include "utils/xmlutils.h"
+
+#include "debug.h"
+
+namespace
+{
+    WeaponsInfos mBows;
+    WeaponsInfos mSwords;
+    WeaponsInfos mShields;
+    bool mLoaded = false;
+}
+
+static void loadDB(const std::string &name, WeaponsInfos &arr)
+{
+    readXmlIntVector("weapons.xml",
+        "weapons",
+        name,
+        "item",
+        "id",
+        arr);
+}
+
+void WeaponsDB::load()
+{
+    if (mLoaded)
+        unload();
+
+    loadDB("swords", mSwords);
+    loadDB("bows", mBows);
+    loadDB("shields", mShields);
+}
+
+void WeaponsDB::unload()
+{
+    mBows.clear();
+    mSwords.clear();
+    mShields.clear();
+    mLoaded = false;
+}
+
+const WeaponsInfos &WeaponsDB::getBows()
+{
+    return mBows;
+}
+
+const WeaponsInfos &WeaponsDB::getSwords()
+{
+    return mSwords;
+}
+
+const WeaponsInfos &WeaponsDB::getShields()
+{
+    return mShields;
+}
diff --git a/src/resources/db/weaponsdb.h b/src/resources/db/weaponsdb.h
new file mode 100644
index 000000000..33688b338
--- /dev/null
+++ b/src/resources/db/weaponsdb.h
@@ -0,0 +1,44 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  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 RESOURCES_DB_WEAPONSDB_H
+#define RESOURCES_DB_WEAPONSDB_H
+
+#include <vector>
+
+#include "localconsts.h"
+
+typedef std::vector<int> WeaponsInfos;
+typedef WeaponsInfos::const_iterator WeaponsInfosIter;
+
+namespace WeaponsDB
+{
+    void load();
+
+    void unload();
+
+    const WeaponsInfos &getBows();
+
+    const WeaponsInfos &getSwords();
+
+    const WeaponsInfos &getShields();
+}  // namespace WeaponsDB
+
+#endif  // RESOURCES_DB_WEAPONSDB_H
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index a1d925a1f..4f9e8a738 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -88,7 +88,7 @@ DyePalette::DyePalette(const std::string &description,
     logger->log("Error, invalid embedded palette: %s", description.c_str());
 }
 
-int DyePalette::hexDecode(const signed char c)
+unsigned int DyePalette::hexDecode(const signed char c)
 {
     if ('0' <= c && c <= '9')
         return c - '0';
diff --git a/src/resources/dye.h b/src/resources/dye.h
index a68839e47..b6003624b 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -82,7 +82,7 @@ class DyePalette final
         void replaceAOGLColor(uint32_t *restrict pixels,
                               const int bufSize) const;
 
-        static int hexDecode(const signed char c) A_WARN_UNUSED;
+        static unsigned int hexDecode(const signed char c) A_WARN_UNUSED;
 
     private:
         std::vector<DyeColor> mColors;
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index e053e0035..4da901b09 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -214,6 +214,7 @@ void MapReader::addLayerToList(const std::string &fileName)
         mKnownLayers[name] = childNode;
         mKnownDocs.insert(doc);
     }
+    delete doc;
 }
 
 Map *MapReader::readMap(const std::string &restrict filename,
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 63f15c18f..075c98c06 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -29,7 +29,6 @@
 
 #include "resources/animation.h"
 #include "resources/dye.h"
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
@@ -79,8 +78,9 @@ void SimpleAnimation::draw(Graphics *const graphics,
     if (!mCurrentFrame || !mCurrentFrame->image)
         return;
 
-    graphics->drawImage2(mCurrentFrame->image,
-        posX + mCurrentFrame->offsetX, posY + mCurrentFrame->offsetY);
+    graphics->drawImage(mCurrentFrame->image,
+        posX + mCurrentFrame->offsetX,
+        posY + mCurrentFrame->offsetY);
 }
 
 void SimpleAnimation::reset()
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 9eb1ea8a2..9a09f383d 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -25,7 +25,7 @@
 
 #include <SDL_mixer.h>
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include <string>
 
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 049c010b3..647c6dd99 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -22,12 +22,15 @@
 
 #include "statuseffect.h"
 
+#include "animatedsprite.h"
 #include "configuration.h"
 #include "logger.h"
 #include "soundmanager.h"
 
 #include "gui/widgets/tabs/chattab.h"
 
+#include "particle/particle.h"
+
 #include "resources/beingcommon.h"
 
 #include <map>
diff --git a/src/statuseffect.h b/src/statuseffect.h
index 6dda71cfc..8bb164820 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -23,12 +23,13 @@
 #ifndef STATUSEFFECT_H
 #define STATUSEFFECT_H
 
-#include "animatedsprite.h"
-
-#include "particle/particle.h"
+#include <string>
 
 #include "localconsts.h"
 
+class AnimatedSprite;
+class Particle;
+
 class StatusEffect final
 {
 public:
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index a0e4f98dc..584bdb5cb 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -94,7 +94,7 @@ int TestLauncher::testBackend() const
 
     for (int f = 0; f < cnt; f ++)
     {
-        mainGraphics->drawImage2(img, cnt * 7, cnt * 5);
+        mainGraphics->drawImage(img, cnt * 7, cnt * 5);
         mainGraphics->updateScreen();
     }
 
@@ -152,11 +152,11 @@ int TestLauncher::testFps()
         {
             for (int y = 0; y < 600; y += 50)
             {
-                mainGraphics->drawImage2(img[idx], x, y);
+                mainGraphics->drawImage(img[idx], x, y);
                 idx ++;
                 if (idx > sz)
                     idx = 0;
-                mainGraphics->drawImage2(img[idx], x, y);
+                mainGraphics->drawImage(img[idx], x, y);
                 idx ++;
                 if (idx > sz)
                     idx = 0;
@@ -211,9 +211,9 @@ int TestLauncher::testInternal()
         {
             for (int y = 0; y < 600; y += 25)
             {
-                mainGraphics->drawImage2(img[idx], x, y);
-                mainGraphics->drawImage2(img[idx], x + 1, y);
-                mainGraphics->drawImage2(img[idx], x, y + 5);
+                mainGraphics->drawImage(img[idx], x, y);
+                mainGraphics->drawImage(img[idx], x + 1, y);
+                mainGraphics->drawImage(img[idx], x, y + 5);
 
                 idx ++;
                 if (idx > 3)
diff --git a/src/text.cpp b/src/text.cpp
index d0027b8ae..27d794d33 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,23 +26,21 @@
 #include "configuration.h"
 #include "textmanager.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 #include "gui/theme.h"
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 int Text::mInstances = 0;
 ImageRect Text::mBubble;
 
 Text::Text(const std::string &text, const int x, const int y,
-           const gcn::Graphics::Alignment alignment,
-           const gcn::Color *const color, const bool isSpeech,
-           gcn::Font *const font) :
+           const Graphics::Alignment alignment,
+           const Color *const color, const bool isSpeech,
+           Font *const font) :
     mFont(font ? font : (gui ? gui->getFont() : nullptr)),
     mX(x),
     mY(y),
@@ -78,13 +76,13 @@ Text::Text(const std::string &text, const int x, const int y,
 
     switch (alignment)
     {
-        case gcn::Graphics::LEFT:
+        case Graphics::LEFT:
             mXOffset = 0;
             break;
-        case gcn::Graphics::CENTER:
+        case Graphics::CENTER:
             mXOffset = mWidth / 2;
             break;
-        case gcn::Graphics::RIGHT:
+        case Graphics::RIGHT:
             mXOffset = mWidth;
             break;
         default:
@@ -114,7 +112,7 @@ Text::~Text()
     }
 }
 
-void Text::setColor(const gcn::Color *const color)
+void Text::setColor(const Color *const color)
 {
     mColor = color;
 }
@@ -137,9 +135,11 @@ void Text::draw(Graphics *const graphics, const int xOff, const int yOff)
     BLOCK_START("Text::draw")
     if (mIsSpeech)
     {
-        static_cast<Graphics*>(graphics)->drawImageRect(
-                mX - xOff - 5, mY - yOff - 5, mWidth + 10, mHeight + 10,
-                mBubble);
+        graphics->drawImageRect(mX - xOff - 5,
+            mY - yOff - 5,
+            mWidth + 10,
+            mHeight + 10,
+            mBubble);
     }
 
     graphics->setColor(*mColor);
@@ -151,8 +151,8 @@ void Text::draw(Graphics *const graphics, const int xOff, const int yOff)
 }
 
 FlashText::FlashText(const std::string &text, const int x, const int y,
-                     const gcn::Graphics::Alignment alignment,
-                     const gcn::Color *const color, gcn::Font *const font) :
+                     const Graphics::Alignment alignment,
+                     const Color *const color, Font *const font) :
     Text(text, x, y, alignment, color, false, font),
     mTime(0)
 {
diff --git a/src/text.h b/src/text.h
index 2c6b9b2b4..497792091 100644
--- a/src/text.h
+++ b/src/text.h
@@ -26,10 +26,12 @@
 
 #include "render/graphics.h"
 
-#include <guichan/color.hpp>
+#include "gui/color.h"
 
 #include "localconsts.h"
 
+class Font;
+
 class Text
 {
     friend class TextManager;
@@ -39,9 +41,9 @@ class Text
          * Constructor creates a text object to display on the screen.
          */
         Text(const std::string &text, const int x, const int y,
-             const gcn::Graphics::Alignment alignment,
-             const gcn::Color *const color, const bool isSpeech = false,
-             gcn::Font *const font = nullptr);
+             const Graphics::Alignment alignment,
+             const Color *const color, const bool isSpeech = false,
+             Font *const font = nullptr);
 
         A_DELETE_COPY(Text)
 
@@ -50,7 +52,7 @@ class Text
          */
         virtual ~Text();
 
-        void setColor(const gcn::Color *const color);
+        void setColor(const Color *const color);
 
         int getWidth() const A_WARN_UNUSED
         { return mWidth; }
@@ -70,7 +72,7 @@ class Text
                           const int xOff, const int yOff);
 
     private:
-        gcn::Font *mFont;      /**< The font of the text */
+        Font *mFont;      /**< The font of the text */
         int mX;                /**< Actual x-value of left of text written. */
         int mY;                /**< Actual y-value of top of text written. */
         int mWidth;            /**< The width of the text. */
@@ -78,8 +80,8 @@ class Text
         int mXOffset;          /**< The offset of mX from the desired x. */
         static int mInstances; /**< Instances of text. */
         std::string mText;     /**< The text to display. */
-        const gcn::Color *mColor;     /**< The color of the text. */
-        const gcn::Color mOutlineColor;
+        const Color *mColor;     /**< The color of the text. */
+        const Color mOutlineColor;
         bool mIsSpeech;        /**< Is this text a speech bubble? */
 
     protected:
@@ -90,9 +92,9 @@ class FlashText final : public Text
 {
     public:
         FlashText(const std::string &text, const int x, const int y,
-                  const gcn::Graphics::Alignment alignment,
-                  const gcn::Color *const color,
-                  gcn::Font *const font = nullptr);
+                  const Graphics::Alignment alignment,
+                  const Color *const color,
+                  Font *const font = nullptr);
 
         A_DELETE_COPY(FlashText)
 
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index a79c14275..d4f7d9f6e 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -20,10 +20,10 @@
 
 #include "touchactions.h"
 
-#include "mouseinput.h"
 #include "touchmanager.h"
 
 #include "input/inputmanager.h"
+#include "input/mouseinput.h"
 
 #include "debug.h"
 
@@ -109,7 +109,7 @@ impHandler(padClick)
 
 impHandler(padEvents)
 {
-    if (mouseInput.getType() == gcn::MouseInput::MOVED)
+    if (mouseInput.getType() == MouseInput::MOVED)
     {
         if (padClicked)
             moveChar(mouseInput.getX(), mouseInput.getY());
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index b7b926383..b1ed41fdc 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -22,11 +22,12 @@
 
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "mouseinput.h"
 #include "touchactions.h"
 
+#include "input/mouseinput.h"
+
+#include "gui/font.h"
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 
 #include "input/inputmanager.h"
 
@@ -34,6 +35,8 @@
 
 #include "gui/theme.h"
 
+#include "resources/image.h"
+
 #include "debug.h"
 
 TouchManager touchManager;
@@ -160,7 +163,7 @@ void TouchManager::loadTouchItem(TouchItem **item, const std::string &name,
                 default:
                     break;
             }
-            *item = new TouchItem(text, gcn::Rectangle(x + diff, y + diff,
+            *item = new TouchItem(text, Rect(x + diff, y + diff,
                 width + border2, height + border2), type,
                 eventPressed, eventReleased, images, icon,
                 x + pad, y + pad, width, height,
@@ -229,7 +232,7 @@ void TouchManager::draw()
                 const Image *const icon = item->icon;
                 if (icon)
                 {
-                    mainGraphics->drawImage2(icon,
+                    mainGraphics->drawImage(icon,
                         item->x + (item->width - icon->mBounds.w) / 2,
                         item->y + (item->height - icon->mBounds.h) / 2);
                 }
@@ -239,7 +242,7 @@ void TouchManager::draw()
     if (!gui)
         return;
 
-    SDLFont *const font = boldFont;
+    Font *const font = boldFont;
     mainGraphics->setColorAll(Theme::getThemeColor(Theme::TEXT),
         Theme::getThemeColor(Theme::TEXT_OUTLINE));
     FOR_EACH (TouchItemVectorCIter, it, mObjects)
@@ -267,7 +270,7 @@ bool TouchManager::processEvent(const MouseInput &mouseInput)
         const TouchItem *const item = *it;
         if (!item || (!mShow && (item != mKeyboard || !mShowKeyboard)))
             continue;
-        const gcn::Rectangle &rect = item->rect;
+        const Rect &rect = item->rect;
         if (rect.isPointInRect(x, y))
         {
             MouseInput event = mouseInput;
@@ -278,13 +281,13 @@ bool TouchManager::processEvent(const MouseInput &mouseInput)
 
             switch (mouseInput.getType())
             {
-                case gcn::MouseInput::PRESSED:
+                case MouseInput::PRESSED:
                     if (!item->eventPressed.empty())
                         executeAction(item->eventPressed);
                     else if (item->funcPressed)
                         item->funcPressed(event);
                     break;
-                case gcn::MouseInput::RELEASED:
+                case MouseInput::RELEASED:
                     if (!item->eventReleased.empty())
                         executeAction(item->eventReleased);
                     else if (item->funcReleased)
diff --git a/src/touchmanager.h b/src/touchmanager.h
index 6f7b96a6d..d874ec452 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -21,19 +21,18 @@
 #ifndef TOUCHMANAGER_H
 #define TOUCHMANAGER_H
 
-#include "resources/image.h"
-
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "input/keydata.h"
 
-#include <guichan/rectangle.hpp>
+#include "gui/rect.h"
 
 #include <string>
 #include <vector>
 
 #include "localconsts.h"
 
+class Image;
 class ImageCollection;
 class ImageRect;
 class MouseInput;
@@ -46,7 +45,7 @@ const int buttonsCount = 12;
 struct TouchItem final
 {
     TouchItem(const std::string &text0,
-              const gcn::Rectangle &rect0, const int type0,
+              const Rect &rect0, const int type0,
               const std::string &eventPressed0,
               const std::string &eventReleased0,
               ImageRect *const images0, Image *const icon0,
@@ -74,7 +73,7 @@ struct TouchItem final
     A_DELETE_COPY(TouchItem)
 
     std::string text;
-    gcn::Rectangle rect;
+    Rect rect;
     int type;
     std::string eventPressed;
     std::string eventReleased;
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 24ec9366e..d671cb0db 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -22,9 +22,10 @@
 
 #if defined(ANDROID) || defined(__native_client__)
 #include "resources/resourcemanager.h"
-#endif
 
 #include "utils/mkdir.h"
+#endif
+
 #include "utils/physfstools.h"
 
 #include "localconsts.h"
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 545a1cc4b..f5a3dc102 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -70,7 +70,7 @@ inline float fastSqrt(const float x) A_WARN_UNUSED;
 constexpr inline float weightedAverage(const float n1, const float n2,
                                        const float w) A_WARN_UNUSED;
 constexpr inline int roundDouble(const double v) A_WARN_UNUSED;
-inline int powerOfTwo(const int input) A_WARN_UNUSED;
+inline int powerOfTwo(const unsigned int input) A_WARN_UNUSED;
 
 inline uint16_t getCrc16(const std::string &str)
 {
@@ -123,9 +123,9 @@ constexpr inline int roundDouble(const double v)
     return (v > 0.0) ? static_cast<int>(v + 0.5) : static_cast<int>(v - 0.5);
 }
 
-inline int powerOfTwo(const int input)
+inline int powerOfTwo(const unsigned int input)
 {
-    int value = 1;
+    unsigned int value = 1;
     while (value < input)
         value <<= 1;
     return value;
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp
index a3f61bde3..96cd0ed29 100644
--- a/src/utils/paths.cpp
+++ b/src/utils/paths.cpp
@@ -28,7 +28,9 @@
 #include "utils/physfstools.h"
 #include "utils/stringutils.h"
 
+#ifdef USE_X11
 #include "resources/resourcemanager.h"
+#endif
 
 #ifdef __native_client__
 #include <limits.h>
diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h
new file mode 100644
index 000000000..282b90afb
--- /dev/null
+++ b/src/utils/sdlpixel.h
@@ -0,0 +1,236 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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/>.
+ */
+
+/*      _______   __   __  __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef UTILS_SDLPIXEL_H
+#define UTILS_SDLPIXEL_H
+
+#include "gui/color.h"
+
+#include "SDL.h"
+
+/**
+  * Puts a pixel on an SDL_Surface.
+  *
+  * @param x the x coordinate on the surface.
+  * @param y the y coordinate on the surface.
+  * @param color the color the pixel should be in.
+  */
+inline void SDLputPixel(SDL_Surface* surface, int x, int y,
+                        const Color& color)
+{
+    if (!surface)
+        return;
+
+    const int bpp = surface->format->BytesPerPixel;
+
+    SDL_LockSurface(surface);
+
+    Uint8 *const p = static_cast<uint8_t*>(surface->pixels)
+        + y * surface->pitch + x * bpp;
+
+    const Uint32 pixel = SDL_MapRGB(surface->format,
+        static_cast<uint8_t>(color.r), static_cast<uint8_t>(color.g),
+        static_cast<uint8_t>(color.b));
+
+    switch (bpp)
+    {
+        case 1:
+            *p = static_cast<uint8_t>(pixel);
+            break;
+
+        case 2:
+            *reinterpret_cast<uint16_t*>(p) = static_cast<uint16_t>(pixel);
+            break;
+
+        case 3:
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+            p[0] = static_cast<uint8_t>((pixel >> 16) & 0xff);
+            p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff);
+            p[2] = static_cast<uint8_t>((pixel) & 0xff);
+#else
+            p[0] = static_cast<uint8_t>((pixel) & 0xff);
+            p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff);
+            p[2] = static_cast<uint8_t>((pixel >> 16) & 0xff);
+#endif
+            break;
+
+        case 4:
+            *reinterpret_cast<Uint32*>(p) = pixel;
+            break;
+
+        default:
+            break;
+    }
+
+    SDL_UnlockSurface(surface);
+}
+
+/**
+  * Blends two 32 bit colors together.
+  *
+  * @param src the source color.
+  * @param dst the destination color.
+  * @param a alpha.
+  */
+inline unsigned int SDLAlpha32(const unsigned int src,
+                               const unsigned int dst,
+                               const unsigned char a)
+{
+    const unsigned int b = ((src & 0xff) * a + (dst & 0xff) * (255 - a)) >> 8;
+    const unsigned int g = ((src & 0xff00) * a + (dst & 0xff00)
+        * (255 - a)) >> 8;
+    const unsigned int r = ((src & 0xff0000) * a + (dst & 0xff0000)
+        * (255 - a)) >> 8;
+
+    return (b & 0xff) | (g & 0xff00) | (r & 0xff0000);
+}
+
+/**
+  * Blends two 16 bit colors together.
+  *
+  * @param src the source color.
+  * @param dst the destination color.
+  * @param a alpha.
+  */
+inline unsigned short SDLAlpha16(const unsigned short src,
+                                 const unsigned short dst,
+                                 const unsigned char a,
+                                 const SDL_PixelFormat *const f)
+{
+    unsigned int b = ((src & f->Rmask) * a + (dst & f->Rmask)
+        * (255 - a)) >> 8;
+    unsigned int g = ((src & f->Gmask) * a + (dst & f->Gmask)
+        * (255 - a)) >> 8;
+    unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask)
+        * (255 - a)) >> 8;
+
+    return static_cast<unsigned short>((b & f->Rmask)
+        | (g & f->Gmask) | (r & f->Bmask));
+}
+
+/**
+  * Puts a pixel on an SDL_Surface with alpha
+  *
+  * @param x the x coordinate on the surface.
+  * @param y the y coordinate on the surface.
+  * @param color the color the pixel should be in.
+  */
+inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y,
+                             const Color& color)
+{
+    const int bpp = surface->format->BytesPerPixel;
+
+    SDL_LockSurface(surface);
+
+    Uint8 *const p = static_cast<uint8_t*>(surface->pixels)
+        + y * surface->pitch + x * bpp;
+
+    const Uint32 pixel = SDL_MapRGB(surface->format,
+        static_cast<uint8_t>(color.r),
+        static_cast<uint8_t>(color.g),
+        static_cast<uint8_t>(color.b));
+
+    switch (bpp)
+    {
+        case 1:
+            *p = static_cast<uint8_t>(pixel);
+            break;
+
+        case 2:
+            *reinterpret_cast<Uint16*>(p) = SDLAlpha16(
+                static_cast<unsigned short>(pixel),
+                *reinterpret_cast<unsigned short*>(p),
+                static_cast<unsigned char>(color.a), surface->format);
+            break;
+
+        case 3:
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+            p[2] = static_cast<uint8_t>((p[2] * (255 - color.a)
+                + color.b * color.a) >> 8);
+            p[1] = static_cast<uint8_t>((p[1] * (255 - color.a)
+                + color.g * color.a) >> 8);
+            p[0] = static_cast<uint8_t>((p[0] * (255 - color.a)
+                + color.r * color.a) >> 8);
+#else
+            p[0] = static_cast<uint8_t>((p[0] * (255 - color.a)
+                + color.b * color.a) >> 8);
+            p[1] = static_cast<uint8_t>((p[1] * (255 - color.a)
+                + color.g * color.a) >> 8);
+            p[2] = static_cast<uint8_t>((p[2] * (255 - color.a)
+                + color.r * color.a) >> 8);
+#endif
+            break;
+
+        case 4:
+            *reinterpret_cast<Uint32*>(p) = SDLAlpha32(pixel,
+                *reinterpret_cast<Uint32*>(p),
+                static_cast<unsigned char>(color.a));
+            break;
+        default:
+            break;
+    }
+
+    SDL_UnlockSurface(surface);
+}
+
+#endif  // UTILS_SDLPIXEL_H
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 224c2a8e8..f47f724a8 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -73,7 +73,7 @@ unsigned int atox(const std::string &str)
     return value;
 }
 
-const char *ipToString(const int address)
+const char *ipToString(const uint32_t address)
 {
     static char asciiIP[18];
 
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 4a73b3e58..7cf924d98 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -90,7 +90,7 @@ std::string toStringPrint(const unsigned int val);
  * @param address the address to convert to a string
  * @return the string representation of the address
  */
-const char *ipToString(const int address) A_WARN_UNUSED;
+const char *ipToString(const uint32_t address) A_WARN_UNUSED;
 
 /**
  * A safe version of sprintf that returns a std::string of the result.
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index f0ab95005..c105bf0da 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -24,6 +24,8 @@
 
 #include "utils/stringutils.h"
 
+#include "utils/translation/podict.h"
+
 #include "logger.h"
 
 #include "debug.h"
diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h
index 08a6ac7b1..41598442b 100644
--- a/src/utils/translation/poparser.h
+++ b/src/utils/translation/poparser.h
@@ -21,13 +21,13 @@
 #ifndef UTILS_TRANSLATION_POPARSER_H
 #define UTILS_TRANSLATION_POPARSER_H
 
-#include "utils/translation/podict.h"
-
 #include "localconsts.h"
 
 #include <sstream>
 #include <string>
 
+class PoDict;
+
 class PoParser final
 {
     public:
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 48d60cda7..d8a281045 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -23,8 +23,8 @@
 #ifndef UTILS_XML_H
 #define UTILS_XML_H
 
-#include <libxml/xmlwriter.h>
 #include <libxml/tree.h>
+#include <libxml/xmlwriter.h>
 
 #include <string>
 
diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp
new file mode 100644
index 000000000..7d19b1064
--- /dev/null
+++ b/src/utils/xmlutils.cpp
@@ -0,0 +1,63 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  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 "utils/xmlutils.h"
+
+#include "logger.h"
+
+#include "utils/xml.h"
+
+#include "debug.h"
+
+void readXmlIntVector(const std::string &fileName,
+                      const std::string &rootName,
+                      const std::string &sectionName,
+                      const std::string &itemName,
+                      const std::string &attributeName,
+                      std::vector<int> &arr)
+{
+    arr.clear();
+    XML::Document doc(fileName);
+    const XmlNodePtrConst rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str()))
+    {
+        logger->log("Error while loading %s!", fileName.c_str());
+        return;
+    }
+
+    for_each_xml_child_node(sectionNode, rootNode)
+    {
+        if (!xmlNameEqual(sectionNode, sectionName.c_str()))
+            continue;
+        for_each_xml_child_node(childNode, sectionNode)
+        {
+            if (!xmlNameEqual(childNode, itemName.c_str()))
+                continue;
+
+            const int val = XML::getProperty(childNode,
+                attributeName.c_str(), -1);
+            if (val == -1)
+                continue;
+
+            arr.push_back(val);
+        }
+    }
+}
diff --git a/src/input/inputevent.cpp b/src/utils/xmlutils.h
index b87e4fe0a..3dbee5f95 100644
--- a/src/input/inputevent.cpp
+++ b/src/utils/xmlutils.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012-2014  The ManaPlus Developers
+ *  Copyright (C) 2014  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -18,12 +18,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input/inputevent.h"
+#ifndef UTILS_XMLUTILS_H
+#define UTILS_XMLUTILS_H
 
-#include "debug.h"
+#include <string>
+#include <vector>
 
-InputEvent::InputEvent(const int action0, const int mask0) :
-    action(action0),
-    mask(mask0)
-{
-}
+void readXmlIntVector(const std::string &fileName,
+                      const std::string &rootName,
+                      const std::string &sectionName,
+                      const std::string &itemName,
+                      const std::string &attributeName,
+                      std::vector<int> &arr);
+
+#endif  // UTILS_XMLUTILS_H
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
new file mode 100644
index 000000000..5b3469805
--- /dev/null
+++ b/src/utils/xmlutils_unittest.cc
@@ -0,0 +1,70 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  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 "utils/xmlutils.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "gtest/gtest.h"
+
+#include "utils/physfstools.h"
+#include "utils/xml.h"
+
+#include "resources/resourcemanager.h"
+
+#include <string>
+#include <vector>
+
+#include "debug.h"
+
+static void init()
+{
+    PHYSFS_init("manaplus");
+    dirSeparator = "/";
+    XML::initXML();
+    logger = new Logger();
+    ResourceManager *resman = ResourceManager::getInstance();
+    resman->addToSearchPath("data", false);
+    resman->addToSearchPath("../data", false);
+}
+
+TEST(xmlutils, readXmlIntVector1)
+{
+    Client::Options options;
+    client = new Client(options);
+    init();
+
+    std::vector<int> arr;
+
+    readXmlIntVector("graphics/gui/browserbox.xml",
+        "skinset",
+        "widget",
+        "option",
+        "value",
+        arr);
+
+    EXPECT_EQ(5, arr.size());
+    EXPECT_EQ(1, arr[0]);
+    EXPECT_EQ(15, arr[1]);
+    EXPECT_EQ(0, arr[2]);
+    EXPECT_EQ(1, arr[3]);
+    EXPECT_EQ(1, arr[4]);
+}